From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 5 Dec 2006 22:38:34 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs lm.c
Message-ID: <20061205223834.16527.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-12-05 22:38:34

Modified files:
	gfs-kernel/src/gfs: lm.c 

Log message:
	Call into the lock module to do a withdraw instead of just calling BUG.
	bz 215962

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.19&r2=1.20

--- cluster/gfs-kernel/src/gfs/lm.c	2006/11/27 20:22:34	1.19
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/12/05 22:38:34	1.20
@@ -104,30 +104,19 @@
 	vprintk(fmt, args);
 	va_end(args);
 
-#if !defined(BZ_215962)
-	/* 
-	 * Temporarily disable GFS1 withdraw function until bz215962 
-	 * is ready. 
-	 *
-	 * A side note: BUG() does stack dump too.    
-	 */
-        printk("GFS: fsid=%s: about to withdraw from the cluster\n",
-                sdp->sd_fsname);
-        BUG();
-#else
-	printk("about to withdraw from the cluster\n");
+	printk("GFS: fsid=%s: about to withdraw from the cluster\n",
+	       sdp->sd_fsname);
+
 	BUG_ON(sdp->sd_args.ar_debug);
-	
-	printk("waiting for outstanding I/O\n");
 
-	/* FIXME: suspend dm device so oustanding bio's complete
-	   and all further io requests fail */
+	printk("GFS: fsid=%s: telling LM to withdraw\n",
+	       sdp->sd_fsname);
 
-	printk("telling LM to withdraw\n");
 	gfs2_withdraw_lockproto(&sdp->sd_lockstruct);
-	printk("withdrawn\n");
+
+	printk("GFS: fsid=%s: withdrawn\n",
+	       sdp->sd_fsname);
 	dump_stack();
-#endif
 
 	return -1;
 }