Merge branch 'stacking-fixes' (vfs stacking fixes from Jann)

[cascardo/linux.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index ec649c9..0670278 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -233,8 +233,8 @@ static int proc_root_readdir(struct file *file, struct dir_context *ctx)
  */
 static const struct file_operations proc_root_operations = {
        .read            = generic_read_dir,
-       .iterate         = proc_root_readdir,
-       .llseek         = default_llseek,
+       .iterate_shared  = proc_root_readdir,
+       .llseek         = generic_file_llseek,
 };
 
 /*