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

[PATCH 13/17] reiser4: remove redundant read_mapping_page error checks

!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 13/17] reiser4: remove redundant read_mapping_page error checks
Date: Wednesday, April 11, 2007 - 10:49 pm

read_mapping_page() is now fully synchronous, so there's no need wait for
the page lock or check for I/O errors.

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

---

diff -urpN -X dontdiff linux-2.6.21-rc6-mm1/fs/reiser4/plugin/file/tail_conversion.c linux-2.6.21-rc6-mm1-test/fs/reiser4/plugin/file/tail_conversion.c
--- linux-2.6.21-rc6-mm1/fs/reiser4/plugin/file/tail_conversion.c	2007-04-09 17:24:03.000000000 -0700
+++ linux-2.6.21-rc6-mm1-test/fs/reiser4/plugin/file/tail_conversion.c	2007-04-10 21:33:47.000000000 -0700
@@ -608,14 +608,6 @@ int extent2tail(unix_file_info_t *uf_inf
 			break;
 		}
 
-		wait_on_page_locked(page);
-
-		if (!PageUptodate(page)) {
-			page_cache_release(page);
-			result = RETERR(-EIO);
-			break;
-		}
-
 		/* cut part of file we have read */
 		start_byte = (__u64) (i << PAGE_CACHE_SHIFT);
 		set_key_offset(&from, start_byte);
diff -urpN -X dontdiff linux-2.6.21-rc6-mm1/fs/reiser4/plugin/item/extent_file_ops.c linux-2.6.21-rc6-mm1-test/fs/reiser4/plugin/item/extent_file_ops.c
--- linux-2.6.21-rc6-mm1/fs/reiser4/plugin/item/extent_file_ops.c	2007-04-10 19:41:14.000000000 -0700
+++ linux-2.6.21-rc6-mm1-test/fs/reiser4/plugin/item/extent_file_ops.c	2007-04-10 21:38:41.000000000 -0700
@@ -1220,15 +1220,8 @@ int reiser4_read_extent(struct file *fil
 		page = read_mapping_page(mapping, cur_page, file);
 		if (IS_ERR(page))
 			return PTR_ERR(page);
-		lock_page(page);
-		if (!PageUptodate(page)) {
-			unlock_page(page);
-			page_cache_release(page);
-			warning("jmacd-97178", "extent_read: page is not up to date");
-			return RETERR(-EIO);
-		}
+
 		mark_page_accessed(page);
-		unlock_page(page);
 
 		/* If users can be writing to this page using arbitrary virtual
 		   addresses, take care about potential aliasing before reading
-
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)