[Cluster-devel] cluster/gfs-kernel/src/gfs lm_interface.h

[Cluster-devel] cluster/gfs-kernel/src/gfs lm_interface.h

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-08-04 19:55:30

Modified files:
	gfs-kernel/src/gfs: lm_interface.h 

Log message:
	bring lm_interface.h in sync with the version in gfs2

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm_interface.h.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- cluster/gfs-kernel/src/gfs/lm_interface.h	2006/01/09 21:12:24	1.1
+++ cluster/gfs-kernel/src/gfs/lm_interface.h	2006/08/04 19:55:30	1.2
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
@@ -260,11 +260,16 @@
 	int ls_flags;
 };
 
-void __init gfs_init_lmh(void);
+void __init gfs2_init_lmh(void);
 
 /*
  * Lock module bottom interface.  A lock module makes itself available to GFS
  * with these functions.
+ *
+ * For the time being, we copy the gfs1 lock module bottom interface so the
+ * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
+ * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
+ * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
  */
 
 int gfs_register_lockproto(struct lm_lockops *proto);
@@ -276,15 +281,15 @@
  * unmounting a file system.
  */
 
-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);
+int gfs2_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 gfs2_unmount_lockproto(struct lm_lockstruct *lockstruct);
 
-void gfs_withdraw_lockproto(struct lm_lockstruct *lockstruct);
+void gfs2_withdraw_lockproto(struct lm_lockstruct *lockstruct);
 
 #endif /* __LM_INTERFACE_DOT_H__ */
 

[Cluster-devel] cluster/gfs-kernel/src/gfs lm_interface.h

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-08-07 14:20:29

Modified files:
	gfs-kernel/src/gfs: lm_interface.h 

Log message:
	update lm_interface.h from version in git tree

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm_interface.h.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- cluster/gfs-kernel/src/gfs/lm_interface.h	2006/08/04 19:55:30	1.2
+++ cluster/gfs-kernel/src/gfs/lm_interface.h	2006/08/07 14:20:29	1.3
@@ -265,16 +265,11 @@
 /*
  * Lock module bottom interface.  A lock module makes itself available to GFS
  * with these functions.
- *
- * For the time being, we copy the gfs1 lock module bottom interface so the
- * same lock modules can be used with both gfs1 and gfs2 (it won't be possible
- * to load both gfs1 and gfs2 at once.)  Eventually the lock modules will fork
- * for gfs1/gfs2 and this API can change to the gfs2_ prefix.
  */
 
-int gfs_register_lockproto(struct lm_lockops *proto);
+int gfs2_register_lockproto(struct lm_lockops *proto);
 
-void gfs_unregister_lockproto(struct lm_lockops *proto);
+void gfs2_unregister_lockproto(struct lm_lockops *proto);
 
 /*
  * Lock module top interface.  GFS calls these functions when mounting or