Commit 73114b6d authored by Eric Biggers's avatar Eric Biggers
Browse files

f2fs: remove f2fs_dir_open() 



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: default avatarChao Yu <yuchao0@huawei.com>
Link: https://lore.kernel.org/r/20201203022041.230976-3-ebiggers@kernel.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 65f62515

fs/f2fs/dir.c

+0 −8
Original line number Diff line number Diff line
@@ -1081,19 +1081,11 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
	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,