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

[mirror_ubuntu-artful-kernel.git] / fs / proc / inode.c

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index a5b2c33745b7be21318679af74737354f8cb1171..c1b72388e57115747790948a172312738997fb0a 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -474,6 +474,13 @@ int proc_fill_super(struct super_block *s, void *data, int silent)
        s->s_magic = PROC_SUPER_MAGIC;
        s->s_op = &proc_sops;
        s->s_time_gran = 1;
+
+       /*
+        * 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
+        */
+       s->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH;
        
        pde_get(&proc_root);
        root_inode = proc_get_inode(s, &proc_root);