[Cluster-devel] [PATCH] gfs2: don't try to lockfs after shutdown

[Cluster-devel] [PATCH] gfs2: don't try to lockfs after shutdown

[David Teigland]

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 <teigland@redhat.com>

Index: linux-2.6.19-quilt/fs/gfs2/lm.c
===================================================================
--- linux-2.6.19-quilt.orig/fs/gfs2/lm.c	2006-11-29 15:57:37.000000000 -0600
+++ linux-2.6.19-quilt/fs/gfs2/lm.c	2006-12-06 11:39:17.375799158 -0600
@@ -104,15 +104,9 @@
 	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");
Index: linux-2.6.19-quilt/fs/gfs2/ops_super.c
===================================================================
--- linux-2.6.19-quilt.orig/fs/gfs2/ops_super.c	2006-11-29 15:57:37.000000000 -0600
+++ linux-2.6.19-quilt/fs/gfs2/ops_super.c	2006-12-06 11:38:12.855658211 -0600
@@ -172,6 +172,9 @@
 	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)

[Cluster-devel] Re: [PATCH] gfs2: don't try to lockfs after shutdown

[Steven Whitehouse]

Hi,

This has the honour of being the first patch in the new -nmw tree,

Steve.

On Wed, 2006-12-06 at 11:46 -0600, David Teigland wrote:
> 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 <teigland@redhat.com>
> 
> Index: linux-2.6.19-quilt/fs/gfs2/lm.c
> ===================================================================
> --- linux-2.6.19-quilt.orig/fs/gfs2/lm.c	2006-11-29 15:57:37.000000000 -0600
> +++ linux-2.6.19-quilt/fs/gfs2/lm.c	2006-12-06 11:39:17.375799158 -0600
> @@ -104,15 +104,9 @@
>  	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");
> Index: linux-2.6.19-quilt/fs/gfs2/ops_super.c
> ===================================================================
> --- linux-2.6.19-quilt.orig/fs/gfs2/ops_super.c	2006-11-29 15:57:37.000000000 -0600
> +++ linux-2.6.19-quilt/fs/gfs2/ops_super.c	2006-12-06 11:38:12.855658211 -0600
> @@ -172,6 +172,9 @@
>  	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)