diff -NurpP --minimal linux-3.6.10-vs2.3.4.4/fs/proc_namespace.c linux-3.6.10-vs2.3.4.5/fs/proc_namespace.c --- linux-3.6.10-vs2.3.4.4/fs/proc_namespace.c 2012-10-04 18:47:00.000000000 +0200 +++ linux-3.6.10-vs2.3.4.5/fs/proc_namespace.c 2012-12-10 18:17:40.000000000 +0100 @@ -82,6 +82,8 @@ static inline void mangle(struct seq_fil seq_escape(m, s, " \t\n\\"); } +#ifdef CONFIG_VSERVER_EXTRA_MNT_CHECK + static int mnt_is_reachable(struct vfsmount *vfsmnt) { struct path root; @@ -110,6 +112,10 @@ static int mnt_is_reachable(struct vfsmo return ret; } +#else +#define mnt_is_reachable(v) (1) +#endif + static void show_type(struct seq_file *m, struct super_block *sb) { mangle(m, sb->s_type->name); diff -NurpP --minimal linux-3.6.10-vs2.3.4.4/kernel/vserver/Kconfig linux-3.6.10-vs2.3.4.5/kernel/vserver/Kconfig --- linux-3.6.10-vs2.3.4.4/kernel/vserver/Kconfig 2012-10-04 18:47:00.000000000 +0200 +++ linux-3.6.10-vs2.3.4.5/kernel/vserver/Kconfig 2012-12-10 18:21:15.000000000 +0100 @@ -176,6 +176,15 @@ config VSERVER_HISTORY_SIZE This allows you to specify the number of entries in the per-CPU history buffer. +config VSERVER_EXTRA_MNT_CHECK + bool "Extra Checks for Reachability" + default n + help + Set this to yes if you want to do extra checks for + vfsmount reachability in the proc filesystem code. + This shouldn't be required on any setup utilizing + mnt namespaces. + choice prompt "Quotes used in debug and warn messages" default QUOTES_ISO8859