1 files changed, 9 insertions, 2 deletions

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 361ab4ee42fc..06702783bf40 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -121,6 +121,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type,
         if (IS_ERR(sb))
                 return ERR_CAST(sb);
 
+        /*
+         * procfs isn't actually a stacking filesystem; however, there is
+         * too much magic going on inside it to permit stacking things on
+         * top of it
+         */
+        sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
+
         if (!proc_parse_options(options, ns)) {
                 deactivate_locked_super(sb);
                 return ERR_PTR(-EINVAL);
@@ -226,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,
 };
 
 /*