Commit 65f62515 authored by Eric Biggers's avatar Eric Biggers
Browse files

ext4: remove ext4_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 avatarAndreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20201203022041.230976-2-ebiggers@kernel.org


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

fs/ext4/dir.c

+0 −8
Original line number Diff line number Diff line
@@ -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,

};