From: "Aneesh Kumar K.V" Subject: Re: [PATCH] ext4: add error processing when calling ext4_mb_init_cache in mballoc Date: Wed, 28 May 2008 15:24:20 +0530 Message-ID: <20080528095420.GD15851@skywalker> References: <483D2884.30309@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: alex@clusterfs.com, Andrew Morton , linux-ext4@vger.kernel.org To: Shen Feng , Mingming Cao Return-path: Received: from E23SMTP04.au.ibm.com ([202.81.18.173]:43373 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751746AbYE1JzP (ORCPT ); Wed, 28 May 2008 05:55:15 -0400 Received: from sd0109e.au.ibm.com (d23rh905.au.ibm.com [202.81.18.225]) by e23smtp04.au.ibm.com (8.13.1/8.13.1) with ESMTP id m4S9sEtF021065 for ; Wed, 28 May 2008 19:54:14 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by sd0109e.au.ibm.com (8.13.8/8.13.8/NCO v8.7) with ESMTP id m4S9x7aQ241798 for ; Wed, 28 May 2008 19:59:07 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m4S9sujn007498 for ; Wed, 28 May 2008 19:54:57 +1000 Content-Disposition: inline In-Reply-To: <483D2884.30309@cn.fujitsu.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Wed, May 28, 2008 at 05:40:20PM +0800, Shen Feng wrote: > Add error processing for ext4_mb_load_buddy when it calls > ext4_mb_init_cache. > > Signed-off-by: Shen Feng Reviewed-by: Aneesh Kumar K.V > --- > fs/ext4/mballoc.c | 27 ++++++++++++++++++++------- > 1 files changed, 20 insertions(+), 7 deletions(-) > > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c > index 35c12db..a30a35d 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -883,6 +883,7 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, > int pnum; > int poff; > struct page *page; > + int ret; > > mb_debug("load group %lu\n", group); > > @@ -914,15 +915,21 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, > if (page) { > BUG_ON(page->mapping != inode->i_mapping); > if (!PageUptodate(page)) { > - ext4_mb_init_cache(page, NULL); > + ret = ext4_mb_init_cache(page, NULL); > + if (ret) { > + unlock_page(page); > + goto err; > + } > mb_cmp_bitmaps(e4b, page_address(page) + > (poff * sb->s_blocksize)); > } > unlock_page(page); > } > } > - if (page == NULL || !PageUptodate(page)) > + if (page == NULL || !PageUptodate(page)) { > + ret = -EIO; > goto err; > + } > e4b->bd_bitmap_page = page; > e4b->bd_bitmap = page_address(page) + (poff * sb->s_blocksize); > mark_page_accessed(page); > @@ -938,14 +945,20 @@ ext4_mb_load_buddy(struct super_block *sb, ext4_group_t group, > page = find_or_create_page(inode->i_mapping, pnum, GFP_NOFS); > if (page) { > BUG_ON(page->mapping != inode->i_mapping); > - if (!PageUptodate(page)) > - ext4_mb_init_cache(page, e4b->bd_bitmap); > - > + if (!PageUptodate(page)) { > + ret = ext4_mb_init_cache(page, e4b->bd_bitmap); > + if (ret) { > + unlock_page(page); > + goto err; > + } > + } > unlock_page(page); > } > } > - if (page == NULL || !PageUptodate(page)) > + if (page == NULL || !PageUptodate(page)) { > + ret = -EIO; > goto err; > + } > e4b->bd_buddy_page = page; > e4b->bd_buddy = page_address(page) + (poff * sb->s_blocksize); > mark_page_accessed(page); > @@ -962,7 +975,7 @@ err: > page_cache_release(e4b->bd_buddy_page); > e4b->bd_buddy = NULL; > e4b->bd_bitmap = NULL; > - return -EIO; > + return ret; > } > > static void ext4_mb_release_desc(struct ext4_buddy *e4b) > -- > 1.5.4.5 > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html