[Cluster-devel] cluster/gfs-kernel/src/gfs gfs.h glock.c lm.c ...

[teigland at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2006-09-20 18:48:56

Modified files:
	gfs-kernel/src/gfs: gfs.h glock.c lm.c 
Removed files:
	gfs-kernel/src/gfs: lm_interface.h 

Log message:
	Get lm_interface.h from the kernel instead of keeping a
	duplicate copy here.  Requires recent upstream gfs2 change
	that moves lm_interface.h from fs/gfs2/ to include/linux/

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/gfs.h.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/glock.c.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm_interface.h.diff?cvsroot=cluster&r1=1.4&r2=NONE

--- cluster/gfs-kernel/src/gfs/gfs.h	2006/08/11 14:32:32	1.11
+++ cluster/gfs-kernel/src/gfs/gfs.h	2006/09/20 18:48:56	1.12
@@ -16,7 +16,8 @@
 
 #define GFS_RELEASE_NAME "<CVS>"
 
-#include "lm_interface.h"
+#include <linux/lm_interface.h>
+
 #include "gfs_ondisk.h"
 #include "fixed_div64.h"
 #include "lvb.h"
--- cluster/gfs-kernel/src/gfs/glock.c	2006/09/13 20:07:38	1.28
+++ cluster/gfs-kernel/src/gfs/glock.c	2006/09/20 18:48:56	1.29
@@ -19,9 +19,9 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <asm/uaccess.h>
+#include <linux/lm_interface.h>
 
 #include "gfs.h"
-#include "lm_interface.h"
 #include "dio.h"
 #include "glock.h"
 #include "glops.h"
--- cluster/gfs-kernel/src/gfs/lm.c	2006/09/13 20:07:38	1.17
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/09/20 18:48:56	1.18
@@ -13,10 +13,10 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/delay.h>
+#include <linux/lm_interface.h>
 
 #include "gfs_ondisk.h"
 #include "gfs.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "glock.h"
 #include "lm.h"