diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2017-01-11 09:55:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-10-03 13:35:15 +0000 |
| commit | 6b1f845ef3460e721da7aeeecc37e41229285f85 (patch) | |
| tree | 4424eeb2931ed5f4b8e694a21f5ee1aac1e2c8cf /fs | |
| parent | 642da1dadeb8bdbeab8acd138afbdc041a723ae9 (diff) | |
f2fs: remove wrong backported codes
Kconfig and dentry RCU mode fixes.
Fixes: c1286ff41c2f610df ("f2fs: backport from 'for-f2fs-4.9'")
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/Kconfig | 1 | ||||
| -rw-r--r-- | fs/f2fs/namei.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/f2fs/Kconfig b/fs/f2fs/Kconfig index 1852d99df97b..378c221d68a9 100644 --- a/fs/f2fs/Kconfig +++ b/fs/f2fs/Kconfig @@ -2,7 +2,6 @@ config F2FS_FS tristate "F2FS filesystem support" depends on BLOCK select CRYPTO - select KEYS select CRYPTO_CRC32 help F2FS is based on Log-structured File System (LFS), which supports diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 468b2dbe6d34..523bf073642e 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -1014,9 +1014,6 @@ static const char *f2fs_encrypted_follow_link(struct dentry *dentry, void **cook u32 max_size = inode->i_sb->s_blocksize; int res; - if (!dentry) - return ERR_PTR(-ECHILD); - res = fscrypt_get_encryption_info(inode); if (res) return ERR_PTR(res); |