f2fs: remove f2fs_dir_open()
authorEric Biggers <ebiggers@google.com>
Thu, 3 Dec 2020 02:20:34 +0000 (18:20 -0800)
committerEric Biggers <ebiggers@google.com>
Thu, 3 Dec 2020 02:25:01 +0000 (18:25 -0800)
Since encrypted directories can be opened and searched without their key
being available, and each readdir and ->lookup() tries to set up the
key, trying to set up the key in ->open() too isn't really useful.

Just remove it so that directories don't need an ->open() method
anymore, and so that we eliminate a use of fscrypt_get_encryption_info()
(which I'd like to stop exporting to filesystems).

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20201203022041.230976-3-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
fs/f2fs/dir.c

index 4b9ef8b..47bee95 100644 (file)
@@ -1081,19 +1081,11 @@ out:
        return err < 0 ? err : 0;
 }
 
-static int f2fs_dir_open(struct inode *inode, struct file *filp)
-{
-       if (IS_ENCRYPTED(inode))
-               return fscrypt_get_encryption_info(inode) ? -EACCES : 0;
-       return 0;
-}
-
 const struct file_operations f2fs_dir_operations = {
        .llseek         = generic_file_llseek,
        .read           = generic_read_dir,
        .iterate_shared = f2fs_readdir,
        .fsync          = f2fs_sync_file,
-       .open           = f2fs_dir_open,
        .unlocked_ioctl = f2fs_ioctl,
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = f2fs_compat_ioctl,