Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751217AbdCMNFt (ORCPT ); Mon, 13 Mar 2017 09:05:49 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:4407 "EHLO dggrg03-dlp.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750808AbdCMNFl (ORCPT ); Mon, 13 Mar 2017 09:05:41 -0400 From: Chao Yu To: CC: , , , Chao Yu Subject: [PATCH v2] f2fs: restrict write IO alignment condition Date: Mon, 13 Mar 2017 21:02:16 +0800 Message-ID: <20170313130216.108395-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.8.2.295.g3f1c1d0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0B0201.58C6986A.005D,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8939b28631feaf077ddbd31aa1fbc86f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1316 Lines: 44 We should only align start offset of bio with defined IO_SIZE for below conditions: a. mode=lfs mount option b. write IOs c. Out-place-update d. non-meta pages Signed-off-by: Chao Yu --- fs/f2fs/data.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 1375fef11146..53fe79c70406 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -190,6 +190,9 @@ static inline void __submit_bio(struct f2fs_sb_info *sbi, current->plug && (type == DATA || type == NODE)) blk_finish_plug(current->plug); + if (!test_opt(sbi, LFS)) + goto submit_io; + if (type != DATA && type != NODE) goto submit_io; @@ -395,11 +398,12 @@ int f2fs_submit_page_mbio(struct f2fs_io_info *fio) __submit_merged_bio(io); alloc_new: if (io->bio == NULL) { - if ((fio->type == DATA || fio->type == NODE) && + if (test_opt(sbi, LFS) && + !is_read && (fio->type == DATA || fio->type == NODE) && fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) { err = -EAGAIN; - if (!is_read) - dec_page_count(sbi, WB_DATA_TYPE(bio_page)); + f2fs_bug_on(sbi, fio->new_blkaddr == fio->old_blkaddr); + dec_page_count(sbi, WB_DATA_TYPE(bio_page)); goto out_fail; } io->bio = __bio_alloc(sbi, fio->new_blkaddr, -- 2.8.2.295.g3f1c1d0