2 files changed, 4 insertions, 7 deletions

diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index effe4a337c1d..e30673dd37e0 100644
--- a/fs/gfs2/lm.c
+++ b/fs/gfs2/lm.c
@@ -104,15 +104,9 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
         vprintk(fmt, args);
         va_end(args);
 
-        fs_err(sdp, "about to withdraw from the cluster\n");
+        fs_err(sdp, "about to withdraw this file system\n");
         BUG_ON(sdp->sd_args.ar_debug);
 
-
-        fs_err(sdp, "waiting for outstanding I/O\n");
-
-        /* FIXME: suspend dm device so oustanding bio's complete
-           and all further io requests fail */
-
         fs_err(sdp, "telling LM to withdraw\n");
         gfs2_withdraw_lockproto(&sdp->sd_lockstruct);
         fs_err(sdp, "withdrawn\n");
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 7685b46f934b..b2837839eed9 100644
--- a/fs/gfs2/ops_super.c
+++ b/fs/gfs2/ops_super.c
@@ -173,6 +173,9 @@ static void gfs2_write_super_lockfs(struct super_block *sb)
         struct gfs2_sbd *sdp = sb->s_fs_info;
         int error;
 
+        if (test_bit(SDF_SHUTDOWN, &sdp->sd_flags))
+                return;
+
         for (;;) {
                 error = gfs2_freeze_fs(sdp);
                 if (!error)