Home » Mailing list archives » linux-fsdevel » 2007 » April » 11

[PATCH 15/17] sysv: convert dir_get_page to read_kmap_page

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Nate Diller <nate.diller@...>
To: Andrew Morton <akpm@...>, Alexander Viro <viro@...>, Christoph Hellwig <hch@...>, Roman Zippel <zippel@...>, Mikulas Patocka <mikulas@...>, David Woodhouse <dwmw2@...>, Dave Kleikamp <shaggy@...>, Anton Altaparmakov <aia21@...>, Evgeniy Dushistov <dushistov@...>
Cc: <linux-kernel@...>, <linux-fsdevel@...>, <reiserfs-dev@...>
Subject: [PATCH 15/17] sysv: convert dir_get_page to read_kmap_page
Date: Wednesday, April 11, 2007 - 10:49 pm

Replace sysv dir_get_page() with the new read_kmap_page().

Signed-off-by: Nate Diller <nate.diller@gmail.com>

---

diff -urpN -X dontdiff linux-2.6.21-rc5-mm4/fs/sysv/dir.c linux-2.6.21-rc5-mm4-test/fs/sysv/dir.c
--- linux-2.6.21-rc5-mm4/fs/sysv/dir.c	2007-04-05 17:14:25.000000000 -0700
+++ linux-2.6.21-rc5-mm4-test/fs/sysv/dir.c	2007-04-06 01:59:19.000000000 -0700
@@ -50,15 +50,6 @@ static int dir_commit_chunk(struct page 
 	return err;
 }
 
-static struct page * dir_get_page(struct inode *dir, unsigned long n)
-{
-	struct address_space *mapping = dir->i_mapping;
-	struct page *page = read_mapping_page(mapping, n, NULL);
-	if (!IS_ERR(page))
-		kmap(page);
-	return page;
-}
-
 static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
 {
 	unsigned long pos = filp->f_pos;
@@ -77,7 +68,7 @@ static int sysv_readdir(struct file * fi
 	for ( ; n < npages; n++, offset = 0) {
 		char *kaddr, *limit;
 		struct sysv_dir_entry *de;
-		struct page *page = dir_get_page(inode, n);
+		struct page *page = read_kmap_page(inode->i_mapping, n);
 
 		if (IS_ERR(page))
 			continue;
@@ -149,7 +140,7 @@ struct sysv_dir_entry *sysv_find_entry(s
 
 	do {
 		char *kaddr;
-		page = dir_get_page(dir, n);
+		page = read_kmap_page(dir->i_mapping, n);
 		if (!IS_ERR(page)) {
 			kaddr = (char*)page_address(page);
 			de = (struct sysv_dir_entry *) kaddr;
@@ -191,7 +182,7 @@ int sysv_add_link(struct dentry *dentry,
 
 	/* We take care of directory expansion in the same loop */
 	for (n = 0; n <= npages; n++) {
-		page = dir_get_page(dir, n);
+		page = read_kmap_page(dir->i_mapping, n);
 		err = PTR_ERR(page);
 		if (IS_ERR(page))
 			goto out;
@@ -299,7 +290,7 @@ int sysv_empty_dir(struct inode * inode)
 	for (i = 0; i < npages; i++) {
 		char *kaddr;
 		struct sysv_dir_entry * de;
-		page = dir_get_page(inode, i);
+		page = read_kmap_page(inode->i_mapping, i);
 
 		if (IS_ERR(page))
 			continue;
@@ -353,7 +344,7 @@ void sysv_set_link(struct sysv_dir_entry
 
 struct sysv_dir_entry * sysv_dotdot (struct inode *dir, struct page **p)
 {
-	struct page *page = dir_get_page(dir, 0);
+	struct page *page = read_kmap_page(dir->i_mapping, 0);
 	struct sysv_dir_entry *de = NULL;
 
 	if (!IS_ERR(page)) {
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/17] fs: cleanup single page synchronous read interf..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 6/17] hfs: remove redundant read_mapping_page error c..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 14/17] reiserfs: convert reiserfs_get_page to read_km..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 11/17] ntfs: convert ntfs_map_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 16/17] ufs: convert ufs_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 17/17] vxfs: convert vxfs_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 12/17] partition: remove redundant read_mapping_page ..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 13/17] reiser4: remove redundant read_mapping_page er..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 15/17] sysv: convert dir_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 10/17] mtd: convert page_read to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 9/17] minix: convert dir_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 8/17] jfs: use locking read_mapping_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_cach..., Nate Diller, (Wed Apr 11, 10:49 pm)
Re: [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_..., David Woodhouse, (Sun Apr 15, 6:52 am)
Re: [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_..., Phillip Lougher, (Thu Apr 12, 7:40 am)
Re: [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_..., Nate Diller, (Thu Apr 12, 2:29 pm)
Re: [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_..., Phillip Lougher, (Thu Apr 12, 2:53 pm)
[PATCH 5/17] hfsplus: remove redundant read_mapping_page err..., Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., David Howells, (Thu Apr 12, 6:58 am)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., Nate Diller, (Thu Apr 12, 2:23 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., David Howells, (Thu Apr 12, 2:57 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., Nate Diller, (Thu Apr 12, 3:27 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., David Howells, (Thu Apr 12, 3:43 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., Andrew Morton, (Thu Apr 12, 3:21 pm)
Re: [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_..., David Howells, (Thu Apr 12, 3:29 pm)
[PATCH 4/17] ext2: convert ext2_get_page to read_kmap_page, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 2/17] fs: introduce new read_cache_page interface, Nate Diller, (Wed Apr 11, 10:49 pm)
[PATCH 1/17] cramfs: use read_mapping_page, Nate Diller, (Wed Apr 11, 10:49 pm)
Re: [PATCH 1/17] cramfs: use read_mapping_page, Christoph Hellwig, (Thu Apr 12, 5:54 am)
Re: [PATCH 1/17] cramfs: use read_mapping_page, Roman Zippel, (Thu Apr 12, 7:26 am)
Re: [PATCH 1/17] cramfs: use read_mapping_page, Nate Diller, (Thu Apr 12, 2:36 pm)