From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbcBXJS7 (ORCPT ); Wed, 24 Feb 2016 04:18:59 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:44190 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068AbcBXJSy (ORCPT ); Wed, 24 Feb 2016 04:18:54 -0500 X-AuditID: cbfee61a-f79266d000003652-6d-56cd7576d818 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] f2fs: introduce f2fs_flush_merged_bios for cleanup Date: Wed, 24 Feb 2016 17:17:55 +0800 Message-id: <00e501d16ee4$5cd5cf50$16816df0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFu5Cl/HeRGZQ4ERyy8j2VBYWSlIw== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFLMWRmVeSWpSXmKPExsVy+t9jAd3y0rNhBs8+sFk8WT+L2eLSIneL y7vmsDkwe2xa1cnmsXvBZyaPz5vkApijuGxSUnMyy1KL9O0SuDJW9XayFRwWqTjTfYilgXGx YBcjJ4eEgInEvP1rWCBsMYkL99azdTFycQgJLGWU2PPkChOE84pR4s+XdnaQKjYBFYnlHf+Z QGwRIPvQostgcWYBD4nGju+sXYwcHMIC7hIPrwaDhFkEVCV6Hk1hAQnzClhKdH6XBAnzCghK /Jh8jwWiU0ti/c7jTBC2vMTmNW+ZIe5RkNhx9jUjxCY9iZcnjkDVi0tsPHKLZQKjwCwko2Yh GTULyahZSFoWMLKsYpRILUguKE5KzzXMSy3XK07MLS7NS9dLzs/dxAgO4WdSOxgP7nI/xCjA wajEw/tgw5kwIdbEsuLK3EOMEhzMSiK8jMAIEOJNSaysSi3Kjy8qzUktPsQozcGiJM77+P+6 MCGB9MSS1OzU1ILUIpgsEwenVAPj/oYTqWEVzHq7F+42NBU0iMtvc5n5IK/wLfuVBoYNzZsP f2ZZ5zo1Mvm7eroI58ZpP7SV2T7GGGR4T/Xp1UvwTzh0UPLDItmn0dKuS69wPmBN3rfl46/b XxvSmG+KJ91dXu/7pGhTsYBouVoTu92G+0JScS+mLHxR97vWzDCrqu7/27u7T7cqsRRnJBpq MRcVJwIAujjbYV0CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new helper f2fs_flush_merged_bios to clean up redundant codes. Signed-off-by: Chao Yu --- fs/f2fs/checkpoint.c | 4 +--- fs/f2fs/data.c | 7 +++++++ fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 7 ++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 2bac8a1..64bbd06 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1141,9 +1141,7 @@ int write_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) trace_f2fs_write_checkpoint(sbi->sb, cpc->reason, "finish block_ops"); - f2fs_submit_merged_bio(sbi, DATA, WRITE); - f2fs_submit_merged_bio(sbi, NODE, WRITE); - f2fs_submit_merged_bio(sbi, META, WRITE); + f2fs_flush_merged_bios(sbi); /* * update checkpoint pack index diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 060c5f7..e5c762b 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -200,6 +200,13 @@ void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *sbi, __f2fs_submit_merged_bio(sbi, inode, page, ino, type, rw); } +void f2fs_flush_merged_bios(struct f2fs_sb_info *sbi) +{ + f2fs_submit_merged_bio(sbi, DATA, WRITE); + f2fs_submit_merged_bio(sbi, NODE, WRITE); + f2fs_submit_merged_bio(sbi, META, WRITE); +} + /* * Fill the locked page with data located in the block address. * Return unlocked page. diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 6e88a66..0d25430 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1873,6 +1873,7 @@ void destroy_checkpoint_caches(void); void f2fs_submit_merged_bio(struct f2fs_sb_info *, enum page_type, int); void f2fs_submit_merged_bio_cond(struct f2fs_sb_info *, struct inode *, struct page *, nid_t, enum page_type, int); +void f2fs_flush_merged_bios(struct f2fs_sb_info *); int f2fs_submit_page_bio(struct f2fs_io_info *); void f2fs_submit_page_mbio(struct f2fs_io_info *); void set_data_blkaddr(struct dnode_of_data *); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 10a32cf..7b62016 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -575,11 +575,8 @@ static void f2fs_put_super(struct super_block *sb) mutex_unlock(&sbi->umount_mutex); /* our cp_error case, we can wait for any writeback page */ - if (get_pages(sbi, F2FS_WRITEBACK)) { - f2fs_submit_merged_bio(sbi, DATA, WRITE); - f2fs_submit_merged_bio(sbi, NODE, WRITE); - f2fs_submit_merged_bio(sbi, META, WRITE); - } + if (get_pages(sbi, F2FS_WRITEBACK)) + f2fs_flush_merged_bios(sbi); iput(sbi->node_inode); iput(sbi->meta_inode); -- 2.7.0