From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Chao Yu <yuchao0@huawei.com>
Cc: linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, chao@kernel.org, mhocko@kernel.org
Subject: Re: [PATCH v2 1/3] f2fs: avoid opened loop codes in __add_ino_entry
Date: Thu, 9 Nov 2017 09:51:29 -0800 [thread overview]
Message-ID: <20171109175129.GA55844@jaegeuk-macbookpro.roam.corp.google.com> (raw)
In-Reply-To: <20171107054142.6242-1-yuchao0@huawei.com>
Hi Chao,
On 11/07, Chao Yu wrote:
> 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 <yuchao0@huawei.com>
> ---
> 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);
I don't think we need this by adding new useless variable.
>
> 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)) {
How about just adding this?
if (unlikely(radix_tree_insert(&im->ino_root, ino, e)))
f2fs_bug_on(sbi, 1);
> - 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
next prev parent reply other threads:[~2017-11-09 17:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 5:41 Chao Yu
2017-11-09 17:51 ` Jaegeuk Kim [this message]
2017-11-10 1:07 ` Chao Yu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171109175129.GA55844@jaegeuk-macbookpro.roam.corp.google.com \
--to=jaegeuk@kernel.org \
--cc=chao@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mhocko@kernel.org \
--cc=yuchao0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®