diff --git a/[refs] b/[refs]
index 156a6393d860..bfe1053cfa43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01b7c7ae88a6376c508b35a22bb61e04cb1b37f0
+refs/heads/master: 9171f5a991e7613cbee816874ad8c9515dcab50f
diff --git a/trunk/fs/gfs2/ops_super.c b/trunk/fs/gfs2/ops_super.c
index 0b7cc920eb89..66907922109f 100644
--- a/trunk/fs/gfs2/ops_super.c
+++ b/trunk/fs/gfs2/ops_super.c
@@ -155,7 +155,7 @@ static void gfs2_write_super(struct super_block *sb)
 static int gfs2_sync_fs(struct super_block *sb, int wait)
 {
 	sb->s_dirt = 0;
-	if (wait)
+	if (wait && sb->s_fs_info)
 		gfs2_log_flush(sb->s_fs_info, NULL);
 	return 0;
 }