Commit a302052b authored by Eric Biggers's avatar Eric Biggers
Browse files

ubifs: remove ubifs_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).

Link: https://lore.kernel.org/r/20201203022041.230976-4-ebiggers@kernel.org


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

fs/ubifs/dir.c

+0 −9
Original line number Diff line number Diff line
@@ -1619,14 +1619,6 @@ int ubifs_getattr(const struct path *path, struct kstat *stat, 
	return 0;

}



static int ubifs_dir_open(struct inode *dir, struct file *file)

{

	if (IS_ENCRYPTED(dir))

		return fscrypt_get_encryption_info(dir) ? -EACCES : 0;



	return 0;

}



const struct inode_operations ubifs_dir_inode_operations = {

	.lookup      = ubifs_lookup,

	.create      = ubifs_create,
@@ -1653,7 +1645,6 @@ const struct file_operations ubifs_dir_operations = { 
	.iterate_shared = ubifs_readdir,

	.fsync          = ubifs_fsync,

	.unlocked_ioctl = ubifs_ioctl,

	.open		= ubifs_dir_open,

#ifdef CONFIG_COMPAT

	.compat_ioctl   = ubifs_compat_ioctl,

#endif