From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nate Diller Subject: [PATCH 13/17] reiser4: remove redundant read_mapping_page error checks Date: Wed, 11 Apr 2007 19:49:38 -0700 Message-ID: <20070412024938.27380.89491.patchbomb.py@localhost> References: <20070412024938.27380.54538.patchbomb.py@localhost> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, reiserfs-dev@namesys.com To: Andrew Morton , Alexander Viro , Christoph Hellwig , Roman Zippel , Mikulas Patocka , David Woodhouse , Dave Kleikamp , Anton Altaparmakov , Evgeniy Dushistov Return-path: Received: from qb-out-0506.google.com ([72.14.204.224]:61978 "EHLO qb-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161534AbXDLCxk (ORCPT ); Wed, 11 Apr 2007 22:53:40 -0400 Received: by qb-out-0506.google.com with SMTP id q10so34039qbq for ; Wed, 11 Apr 2007 19:53:40 -0700 (PDT) In-Reply-To: <20070412024938.27380.54538.patchbomb.py@localhost> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org 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 --- 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