diff -NurpP --minimal linux-3.1.4-vs2.3.2.1/kernel/vserver/inode.c linux-3.1.4-vs2.3.2.2/kernel/vserver/inode.c
--- linux-3.1.4-vs2.3.2.1/kernel/vserver/inode.c	2011-10-24 18:53:33.000000000 +0200
+++ linux-3.1.4-vs2.3.2.2/kernel/vserver/inode.c	2011-12-06 23:58:02.000000000 +0100
@@ -346,7 +346,7 @@ int dx_parse_tag(char *string, tag_t *ta
 	substring_t args[MAX_OPT_ARGS];
 	int token;
 	char *s, *p, *opts;
-#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_WARN)
+#if defined(CONFIG_PROPAGATE) || defined(CONFIG_VSERVER_DEBUG)
 	int option = 0;
 #endif
 
@@ -384,7 +384,7 @@ int dx_parse_tag(char *string, tag_t *ta
 			*mnt_flags |= MNT_TAGID;
 			set |= MNT_TAGID;
 			break;
-#endif
+#endif	/* CONFIG_PROPAGATE */
 		case Opt_notagcheck:
 			if (remove)
 				__dx_parse_remove(s, "notagcheck");