From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947451AbdDYVqn (ORCPT ); Tue, 25 Apr 2017 17:46:43 -0400 Received: from mail.kernel.org ([198.145.29.136]:45196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946946AbdDYVq2 (ORCPT ); Tue, 25 Apr 2017 17:46:28 -0400 From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH] f2fs: introduce valid_ipu_blkaddr to clean up Date: Tue, 25 Apr 2017 14:46:24 -0700 Message-Id: <20170425214624.5027-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces valid_ipu_blkaddr to clean up checking block address for inplace-update. Signed-off-by: Jaegeuk Kim --- fs/f2fs/data.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index b2992dbdd11e..c2b98e44c5f3 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1331,8 +1331,6 @@ static int encrypt_one_page(struct f2fs_io_info *fio) static inline bool need_inplace_update(struct f2fs_io_info *fio) { - if (fio->old_blkaddr == NEW_ADDR) - return false; if (is_cold_data(fio->page)) return false; if (IS_ATOMIC_WRITTEN_PAGE(fio->page)) @@ -1341,6 +1339,15 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio) return need_inplace_update_policy(fio->page->mapping->host, fio); } +static inline bool valid_ipu_blkaddr(struct f2fs_io_info *fio) +{ + if (fio->old_blkaddr == NEW_ADDR) + return false; + if (fio->old_blkaddr == NULL_ADDR) + return false; + return true; +} + int do_write_data_page(struct f2fs_io_info *fio) { struct page *page = fio->page; @@ -1354,8 +1361,8 @@ int do_write_data_page(struct f2fs_io_info *fio) if (need_inplace_update(fio) && f2fs_lookup_extent_cache(inode, page->index, &ei)) { fio->old_blkaddr = ei.blk + page->index - ei.fofs; - if (fio->old_blkaddr != NULL_ADDR && - fio->old_blkaddr != NEW_ADDR) { + + if (valid_ipu_blkaddr(fio)) { ipu_force = true; goto got_it; } @@ -1382,7 +1389,7 @@ int do_write_data_page(struct f2fs_io_info *fio) * If current allocation needs SSR, * it had better in-place writes for updated data. */ - if (ipu_force || need_inplace_update(fio)) { + if (ipu_force || (valid_ipu_blkaddr(fio) && need_inplace_update(fio))) { f2fs_bug_on(fio->sbi, fio->cp_rwsem_locked); f2fs_put_dnode(&dn); err = rewrite_data_page(fio); -- 2.11.0