Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753292Ab3IWBzw (ORCPT ); Sun, 22 Sep 2013 21:55:52 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:4987 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752611Ab3IWBzu (ORCPT ); Sun, 22 Sep 2013 21:55:50 -0400 X-IronPort-AV: E=Sophos;i="4.90,938,1371052800"; d="scan'208";a="8590379" Message-ID: <523F9E77.4010304@cn.fujitsu.com> Date: Mon, 23 Sep 2013 09:50:47 +0800 From: Gu Zheng User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:7.0.1) Gecko/20110930 Thunderbird/7.0.1 MIME-Version: 1.0 To: Chao Yu CC: Kim Jaegeuk , linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, =?GB2312?B?zLfmrQ==?= Subject: Re: [f2fs-dev] [PATCH] f2fs: avoid allocating failure in bio_alloc References: <000001ceb768$9478ce70$bd6a6b50$@samsung.com> In-Reply-To: <000001ceb768$9478ce70$bd6a6b50$@samsung.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/23 09:54:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/23 09:54:09, Serialize complete at 2013/09/23 09:54:09 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=GB2312 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2236 Lines: 68 On 09/22/2013 03:50 PM, Chao Yu wrote: > This patch add macro MAX_BIO_BLOCKS to limit value of npages in > f2fs_bio_alloc, it can avoid allocating failure in bio_alloc caused by > npages is larger than BIO_MAX_PAGES. > > Signed-off-by: Yu Chao Reviewed-by: Gu Zheng > --- > fs/f2fs/segment.c | 4 +++- > fs/f2fs/segment.h | 2 ++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c > index 09af9c7..bd79bbe 100644 > --- a/fs/f2fs/segment.c > +++ b/fs/f2fs/segment.c > @@ -657,6 +657,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi, > struct page *page, > block_t blk_addr, enum page_type type) > { > struct block_device *bdev = sbi->sb->s_bdev; > + int bio_blocks; > > verify_block_addr(sbi, blk_addr); > > @@ -676,7 +677,8 @@ retry: > goto retry; > } > > - sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi)); > + bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi)); > + sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks); > sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi, > blk_addr); > sbi->bio[type]->bi_private = priv; > /* > diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h > index bdd10ea..7f94d78 100644 > --- a/fs/f2fs/segment.h > +++ b/fs/f2fs/segment.h > @@ -90,6 +90,8 @@ > (blk_addr << ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE)) > #define SECTOR_TO_BLOCK(sbi, sectors) \ > (sectors >> ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE)) > +#define MAX_BIO_BLOCKS(max_hw_blocks) \ > + (min((int)max_hw_blocks, BIO_MAX_PAGES)) > > /* during checkpoint, bio_private is used to synchronize the last bio */ > struct bio_private { > --- > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/