From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Mason Subject: Re: [PATCH 09/18] btrfs: Fix return value of read_extent_buffer_pages() when lock page failed Date: Tue, 30 Mar 2010 20:09:47 -0400 Message-ID: <20100331000947.GS13190@think> References: <4BAB5817.8020803@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linux Btrfs To: Miao Xie Return-path: In-Reply-To: <4BAB5817.8020803@cn.fujitsu.com> List-ID: On Thu, Mar 25, 2010 at 08:33:27PM +0800, Miao Xie wrote: > From: Zhao Lei > > read_extent_buffer_pages() should return error value instead of 0 when > lock page failed, we fix this problem. [ Thanks for all of these patches! ] This isn't strictly an IO error, the caller has said they are not willing to wait, so we don't wait. That's different from finding a page where the IO had failed. In general we ignore the errors until the caller is willing to wait for the result. -chris > > Signed-off-by: Zhao Lei > Signed-off-by: Miao Xie > --- > fs/btrfs/extent_io.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index bdfbfa6..3194c79 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -3419,8 +3419,10 @@ int read_extent_buffer_pages(struct extent_io_tree *tree, > for (i = start_i; i < num_pages; i++) { > page = extent_buffer_page(eb, i); > if (!wait) { > - if (!trylock_page(page)) > + if (!trylock_page(page)) { > + ret = -EIO; > goto unlock_exit; > + } > } else { > lock_page(page); > } > -- > 1.6.5.2 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html