From 304cd97e9fd9821409e0dbd4cb14587ea2915cb2 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Fri, 30 Oct 2009 10:48:53 +0000
Subject: [PATCH] --- yaml --- r: 169202 b: refs/heads/master c:
 cdcfde62dac64c86ff34e483c595d568a252c433 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/gfs2/super.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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;
 }