From: Al Viro Date: Wed, 20 Apr 2016 23:59:01 +0000 (-0400) Subject: kernfs: no point locking directory around that generic_file_llseek() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8cb0d2c1c7dea61e9b976cadedeae228f1180cbd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git kernfs: no point locking directory around that generic_file_llseek() Signed-off-by: Al Viro --- diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 03b688d19f69..4f61d19cde18 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1643,22 +1643,9 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx) return 0; } -static loff_t kernfs_dir_fop_llseek(struct file *file, loff_t offset, - int whence) -{ - struct inode *inode = file_inode(file); - loff_t ret; - - inode_lock(inode); - ret = generic_file_llseek(file, offset, whence); - inode_unlock(inode); - - return ret; -} - const struct file_operations kernfs_dir_fops = { .read = generic_read_dir, - .iterate = kernfs_fop_readdir, + .iterate_shared = kernfs_fop_readdir, .release = kernfs_dir_fop_release, - .llseek = kernfs_dir_fop_llseek, + .llseek = generic_file_llseek, };