f2fs: don't call fscrypt_get_encryption_info() explicitly in f2fs_tmpfile()
authorChao Yu <yuchao0@huawei.com>
Sat, 21 Mar 2020 12:23:27 +0000 (20:23 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 31 Mar 2020 03:46:24 +0000 (20:46 -0700)
In f2fs_tmpfile(), parent inode's encryption info is only used when
inheriting encryption context to its child inode, however, we have
already called fscrypt_get_encryption_info() in fscrypt_inherit_context()
to get the encryption info, so just removing unneeded one in
f2fs_tmpfile().

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/namei.c

index 95cfbce062e8b910830d52e007d6932e508c08ce..f54119da2217ffbc82670d2e9b5f5f44efa6f940 100644 (file)
@@ -874,12 +874,6 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
        if (!f2fs_is_checkpoint_ready(sbi))
                return -ENOSPC;
 
-       if (IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) {
-               int err = fscrypt_get_encryption_info(dir);
-               if (err)
-                       return err;
-       }
-
        return __f2fs_tmpfile(dir, dentry, mode, NULL);
 }