Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-block.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 361ab4ee42fc3632232f4bc6eaef54a12f6b47e6..55bc7d6c8aacaed2f4892bd1a554e3baf939bf34 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -226,8 +226,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,
 };
 
 /*