Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / kernfs / dir.c

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 37f9678..68a4431 100644 (file)
--- 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,
 };