diff options
| author | Chao Yu <yuchao0@huawei.com> | 2017-11-10 09:30:42 +0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-11-10 11:50:12 -0800 |
| commit | 19526d74cfbe31b04fb81b64c2884687a321f4a0 (patch) | |
| tree | bb5691380438c44ec0a6ae7b36013e0d816892ac /fs/f2fs | |
| parent | 4f0a03d34dd46afcec5d9c9ada8ab97712d64cf8 (diff) | |
| download | linux-stable-19526d74cfbe31b04fb81b64c2884687a321f4a0.tar.gz linux-stable-19526d74cfbe31b04fb81b64c2884687a321f4a0.tar.bz2 linux-stable-19526d74cfbe31b04fb81b64c2884687a321f4a0.zip | |
f2fs: avoid opened loop codes in __add_ino_entry
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>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/checkpoint.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 98777c1ae70c..a30024f2a567 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -407,18 +407,16 @@ static void __add_ino_entry(struct f2fs_sb_info *sbi, nid_t ino, struct ino_entry *e, *tmp; tmp = f2fs_kmem_cache_alloc(ino_entry_slab, GFP_NOFS); -retry: + radix_tree_preload(GFP_NOFS | __GFP_NOFAIL); 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; - } + if (unlikely(radix_tree_insert(&im->ino_root, ino, e))) + f2fs_bug_on(sbi, 1); + memset(e, 0, sizeof(struct ino_entry)); e->ino = ino; |