Merge branch 'ovl-fixes' into for-linus

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

diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c
index 72cb26f..51b8b0a 100644 (file)
--- a/fs/proc/namespaces.c
+++ b/fs/proc/namespaces.c
@@ -139,7 +139,8 @@ out:
 
 const struct file_operations proc_ns_dir_operations = {
        .read           = generic_read_dir,
-       .iterate        = proc_ns_dir_readdir,
+       .iterate_shared = proc_ns_dir_readdir,
+       .llseek         = generic_file_llseek,
 };
 
 static struct dentry *proc_ns_dir_lookup(struct inode *dir,