diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-07 11:18:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-07 11:18:34 -0700 |
| commit | 68c2f356c9ec65e1eb50c31690b095673dbd8010 (patch) | |
| tree | 98ae95476a7281f40563683c66f6b60d6be5eae4 /fs/f2fs/namei.c | |
| parent | fbb7b92f16710a3848db25d0a4a2bb6fb7199061 (diff) | |
| parent | 7263b1bd0490fca68ee7eedb0b6973cb86d4701c (diff) | |
| download | linux-68c2f356c9ec65e1eb50c31690b095673dbd8010.tar.bz2 | |
Merge tag 'for-f2fs-4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
Pull f2fs fixes from Jaegeuk Kim:
"Fix a performance regression and a bug"
* tag 'for-f2fs-4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs:
f2fs: fix wrong error hanlder in f2fs_follow_link
Revert "f2fs: enhance multi-threads performance"
Diffstat (limited to 'fs/f2fs/namei.c')
| -rw-r--r-- | fs/f2fs/namei.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 7e3794edae42..658e8079aaf9 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -298,16 +298,14 @@ fail: static void *f2fs_follow_link(struct dentry *dentry, struct nameidata *nd) { - struct page *page; + struct page *page = page_follow_link_light(dentry, nd); - page = page_follow_link_light(dentry, nd); - if (IS_ERR(page)) + if (IS_ERR_OR_NULL(page)) return page; /* this is broken symlink case */ if (*nd_get_link(nd) == 0) { - kunmap(page); - page_cache_release(page); + page_put_link(dentry, nd, page); return ERR_PTR(-ENOENT); } return page; |