public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Nate Diller <nate.diller@gmail.com>
To: Andrew Morton <akpm@osdl.org>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	Christoph Hellwig <hch@infradead.org>,
	Roman Zippel <zippel@linux-m68k.org>,
	Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>,
	David Woodhouse <dwmw2@infradead.org>,
	Dave Kleikamp <shaggy@austin.ibm.com>,
	Anton Altaparmakov <aia21@cantab.net>,
	Evgeniy Dushistov <dushistov@mail.ru>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	reiserfs-dev@namesys.com
Subject: [PATCH 13/17] reiser4: remove redundant read_mapping_page error checks
Date: Wed, 11 Apr 2007 19:49:38 -0700	[thread overview]
Message-ID: <20070412024938.27380.89491.patchbomb.py@localhost> (raw)
In-Reply-To: <20070412024938.27380.54538.patchbomb.py@localhost>

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

  parent reply	other threads:[~2007-04-12  2:53 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-12  2:49 [PATCH 0/17] fs: cleanup single page synchronous read interface Nate Diller
2007-04-12  2:49 ` [PATCH 5/17] hfsplus: remove redundant read_mapping_page error check Nate Diller
2007-04-12  2:49 ` [PATCH 17/17] vxfs: convert vxfs_get_page to read_kmap_page Nate Diller
2007-04-12  2:49 ` [PATCH 6/17] hfs: remove redundant read_mapping_page error check Nate Diller
2007-04-12  2:49 ` [PATCH 4/17] ext2: convert ext2_get_page to read_kmap_page Nate Diller
2007-04-12  2:49 ` [PATCH 3/17] afs: convert afs_dir_get_page " Nate Diller
2007-04-12 10:58   ` David Howells
2007-04-12 18:23     ` Nate Diller
2007-04-12 18:57       ` David Howells
2007-04-12 19:21         ` Andrew Morton
2007-04-12 19:29           ` David Howells
2007-07-16  6:05           ` Drop patch update-isdn-tree-to-use-pci_get_device.patch from -mm tree Surya Prabhakar N
2007-04-12 19:27         ` [PATCH 3/17] afs: convert afs_dir_get_page to read_kmap_page Nate Diller
2007-04-12 19:43           ` David Howells
2007-04-12  2:49 ` [PATCH 9/17] minix: convert dir_get_page " Nate Diller
2007-04-12  2:49 ` [PATCH 2/17] fs: introduce new read_cache_page interface Nate Diller
2007-04-12  2:49 ` [PATCH 12/17] partition: remove redundant read_mapping_page error checks Nate Diller
2007-04-12  2:49 ` [PATCH 7/17] jffs2: convert jffs2_gc_fetch_page to read_cache_page Nate Diller
2007-04-12 11:40   ` Phillip Lougher
2007-04-12 18:29     ` Nate Diller
2007-04-12 18:53       ` Phillip Lougher
2007-04-15 10:52   ` David Woodhouse
2007-04-12  2:49 ` [PATCH 14/17] reiserfs: convert reiserfs_get_page to read_kmap_page Nate Diller
2007-04-12  2:49 ` [PATCH 16/17] ufs: convert ufs_get_page " Nate Diller
2007-04-12  2:49 ` [PATCH 10/17] mtd: convert page_read " Nate Diller
2007-04-12  2:49 ` [PATCH 8/17] jfs: use locking read_mapping_page Nate Diller
2007-04-12  2:49 ` [PATCH 11/17] ntfs: convert ntfs_map_page to read_kmap_page Nate Diller
2007-04-12  2:49 ` Nate Diller [this message]
2007-04-12  2:49 ` [PATCH 1/17] cramfs: use read_mapping_page Nate Diller
2007-04-12  9:54   ` Christoph Hellwig
2007-04-12 11:26     ` Roman Zippel
2007-04-12 18:36       ` Nate Diller
2007-04-12  2:49 ` [PATCH 15/17] sysv: convert dir_get_page to read_kmap_page Nate Diller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070412024938.27380.89491.patchbomb.py@localhost \
    --to=nate.diller@gmail.com \
    --cc=aia21@cantab.net \
    --cc=akpm@osdl.org \
    --cc=dushistov@mail.ru \
    --cc=dwmw2@infradead.org \
    --cc=hch@infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikulas@artax.karlin.mff.cuni.cz \
    --cc=reiserfs-dev@namesys.com \
    --cc=shaggy@austin.ibm.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=zippel@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox