ext4: remove ext4_dir_open()
authorEric Biggers <ebiggers@google.com>
Thu, 3 Dec 2020 02:20:33 +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: Andreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20201203022041.230976-2-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
fs/ext4/dir.c

index ca50c90..16bfbdd 100644 (file)
@@ -616,13 +616,6 @@ finished:
        return 0;
 }
 
-static int ext4_dir_open(struct inode * inode, struct file * filp)
-{
-       if (IS_ENCRYPTED(inode))
-               return fscrypt_get_encryption_info(inode) ? -EACCES : 0;
-       return 0;
-}
-
 static int ext4_release_dir(struct inode *inode, struct file *filp)
 {
        if (filp->private_data)
@@ -664,7 +657,6 @@ const struct file_operations ext4_dir_operations = {
        .compat_ioctl   = ext4_compat_ioctl,
 #endif
        .fsync          = ext4_sync_file,
-       .open           = ext4_dir_open,
        .release        = ext4_release_dir,
 };