From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 11 Jul 2006 14:19:34 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs Makefile lm.c locking.c
Message-ID: <20060711141934.6087.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:	rpeterso at sourceware.org	2006-07-11 14:19:34

Modified files:
	gfs-kernel/src/gfs: Makefile lm.c 
Added files:
	gfs-kernel/src/gfs: locking.c 

Log message:
	Re-add locking.c with its redundant gfs_mount_lockproto and
	gfs_unmount_lockproto routines because calling the gfs2
	equivalents (and the externalizing of them) would probably not
	be acceptable to the upstream community.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/locking.c.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.11&r2=1.12

diff -u -r1.6 -r1.7
--- cluster/gfs-kernel/src/gfs/Makefile	2006/07/10 23:22:34	1.10
+++ cluster/gfs-kernel/src/gfs/Makefile	2006/07/11 14:19:34	1.11
@@ -40,6 +40,7 @@
 	inode.o \
 	ioctl.o \
 	lm.o \
+	locking.o \
 	log.o \
 	lops.o \
 	lvb.o \
--- cluster/gfs-kernel/src/gfs/lm.c	2006/07/10 23:22:34	1.11
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/07/11 14:19:34	1.12
@@ -24,6 +24,16 @@
 #include "util.h"
 #include "lvb.h"
 
+int gfs_mount_lockproto(char *proto_name, char *table_name, char *host_data,
+						lm_callback_t cb, lm_fsdata_t *fsdata,
+						unsigned int min_lvb_size, int flags,
+						struct lm_lockstruct *lockstruct,
+						struct kobject *fskobj);
+
+void gfs_unmount_lockproto(struct lm_lockstruct *lockstruct);
+
+void gfs_withdraw_lockproto(struct lm_lockstruct *lockstruct);
+
 /**
  * gfs_lm_mount - mount a locking protocol
  * @sdp: the filesystem
@@ -45,7 +55,7 @@
 
 	printk("Trying to join cluster \"%s\", \"%s\"\n", proto, table);
 
-	error = gfs2_mount_lockproto(proto, table, sdp->sd_args.ar_hostdata,
+	error = gfs_mount_lockproto(proto, table, sdp->sd_args.ar_hostdata,
 				     gfs_glock_cb, sdp,
 				     GFS_MIN_LVB_SIZE, flags,
 				     &sdp->sd_lockstruct, &sdp->sd_kobj);
@@ -59,7 +69,7 @@
 	    gfs_assert_warn(sdp, sdp->sd_lockstruct.ls_ops) ||
 	    gfs_assert_warn(sdp, sdp->sd_lockstruct.ls_lvb_size >=
 				  GFS_MIN_LVB_SIZE)) {
-		gfs2_unmount_lockproto(&sdp->sd_lockstruct);
+		gfs_unmount_lockproto(&sdp->sd_lockstruct);
 		goto out;
 	}
 
@@ -90,7 +100,7 @@
 void gfs_lm_unmount(struct gfs_sbd *sdp)
 {
 	if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-		gfs2_unmount_lockproto(&sdp->sd_lockstruct);
+		gfs_unmount_lockproto(&sdp->sd_lockstruct);
 }
 
 int gfs_lm_withdraw(struct gfs_sbd *sdp, char *fmt, ...)
@@ -114,7 +124,7 @@
 	   and all further io requests fail */
 
 	printk("telling LM to withdraw\n");
-	gfs2_withdraw_lockproto(&sdp->sd_lockstruct);
+	gfs_withdraw_lockproto(&sdp->sd_lockstruct);
 	printk("withdrawn\n");
 	dump_stack();