From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753496AbdKGFnM (ORCPT ); Tue, 7 Nov 2017 00:43:12 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:9967 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752423AbdKGFnL (ORCPT ); Tue, 7 Nov 2017 00:43:11 -0500 From: Chao Yu To: CC: , , , , Chao Yu Subject: [PATCH v2 1/3] f2fs: avoid opened loop codes in __add_ino_entry Date: Tue, 7 Nov 2017 13:41:42 +0800 Message-ID: <20171107054142.6242-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.15.0.55.gc2ece9dc4de6 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.0A090202.5A0147CD.0060,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: 27cd522a90aaaf9fea83d53d8e5ac223 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We will keep __add_ino_entry success all the time, for ENOMEM failure case, we have already handled it by using __GFP_NOFAIL flag, so we don't have to use additional opened loop codes here, remove them. Signed-off-by: Chao Yu --- v2: As Michal Hocko suggested, with __GFP_NOFAIL, MM will do all it can for memory allocation including access memory reserves, so it's better to use it rather than opened loop code, update this patch for it. fs/f2fs/checkpoint.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 98777c1ae70c..80b90146cff2 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -405,20 +405,21 @@ static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, { struct inode_management *im = &sbi->im[type]; struct ino_entry *e, *tmp; + bool preloaded; + int err; tmp = f2fs_kmem_cache_alloc(ino_entry_slab, GFP_NOFS); -retry: - radix_tree_preload(GFP_NOFS | __GFP_NOFAIL); + + preloaded = !radix_tree_preload(GFP_NOFS | __GFP_NOFAIL); + f2fs_bug_on(sbi, !preloaded); spin_lock(&im->ino_lock); e = radix_tree_lookup(&im->ino_root, ino); if (!e) { e = tmp; - if (radix_tree_insert(&im->ino_root, ino, e)) { - spin_unlock(&im->ino_lock); - radix_tree_preload_end(); - goto retry; - } + err = radix_tree_insert(&im->ino_root, ino, e); + f2fs_bug_on(sbi, err); + memset(e, 0, sizeof(struct ino_entry)); e->ino = ino; @@ -431,7 +432,9 @@ static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, f2fs_set_bit(devidx, (char *)&e->dirty_device); spin_unlock(&im->ino_lock); - radix_tree_preload_end(); + + if (preloaded) + radix_tree_preload_end(); if (e != tmp) kmem_cache_free(ino_entry_slab, tmp); -- 2.15.0.55.gc2ece9dc4de6