Commit:     c378051177dce4421428fd1691ffdf15ad57c161
Parent:     62d0cfcb27cf755cebdc93ca95dabc83608007cd
Author:     David Teigland <[EMAIL PROTECTED]>
AuthorDate: Wed Dec 6 11:46:33 2006 -0600
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Feb 5 13:35:44 2007 -0500

    [GFS2] don't try to lockfs after shutdown
    If an fs has already been shut down, a lockfs callback should do nothing.
    An fs that's been shut down can't acquire locks or do anything with
    respect to the cluster.
    Also, remove FIXME comment in withdraw function.  The missing bits of the
    withdraw procedure are now all done by user space.
    Signed-off-by: David Teigland <[EMAIL PROTECTED]>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
 fs/gfs2/lm.c        |    8 +-------
 fs/gfs2/ops_super.c |    3 +++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index effe4a3..e30673d 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);
-       fs_err(sdp, "about to withdraw from the cluster\n");
+       fs_err(sdp, "about to withdraw this file system\n");
-       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");
        fs_err(sdp, "withdrawn\n");
diff --git a/fs/gfs2/ops_super.c b/fs/gfs2/ops_super.c
index 7685b46..b283783 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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to