diff --git a/[refs] b/[refs]
index 6640e4723090..5ef78d82715b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f25934c5f88655a8d5c3c40a540daed1f0e6dedc
+refs/heads/master: cdcfde62dac64c86ff34e483c595d568a252c433
diff --git a/trunk/fs/gfs2/super.c b/trunk/fs/gfs2/super.c
index 5e4b31441a9e..c282ad41f3d1 100644
--- a/trunk/fs/gfs2/super.c
+++ b/trunk/fs/gfs2/super.c
@@ -1336,6 +1336,9 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
 		}
 		seq_printf(s, ",errors=%s", state);
 	}
+	if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags))
+		seq_printf(s, ",nobarrier");
+
 	return 0;
 }