| Message ID | 20201125002336.274045-2-ebiggers@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Allow deleting files with unsupported encryption policy | expand |
On Nov 24, 2020, at 5:23 PM, Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > Since encrypted directories can be opened without their encryption key > being available, and each readdir 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). > > Signed-off-by: Eric Biggers <ebiggers@google.com> Reviewed-by: Andreas Dilger <adilger@dilger.ca> > --- > fs/ext4/dir.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c > index ca50c90adc4c..16bfbdd5007c 100644 > --- a/fs/ext4/dir.c > +++ b/fs/ext4/dir.c > @@ -616,13 +616,6 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx) > 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, > }; > > -- > 2.29.2 > Cheers, Andreas
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index ca50c90adc4c..16bfbdd5007c 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -616,13 +616,6 @@ static int ext4_dx_readdir(struct file *file, struct dir_context *ctx) 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, };