From mboxrd@z Thu Jan  1 00:00:00 1970
From: rpeterso@sourceware.org <rpeterso@sourceware.org>
Date: 11 Aug 2006 14:32:33 -0000
Subject: [Cluster-devel] cluster/gfs-kernel/src/gfs Makefile gfs.h ioct ...
Message-ID: <20060811143233.25328.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-08-11 14:32:32

Modified files:
	gfs-kernel/src/gfs: Makefile gfs.h ioctl.c lm.c ondisk.c 
	                    ops_file.c 

Log message:
	Get rid of symlink "linux" for referencing includes and
	use the correct lm_interface.h.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/gfs.h.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ioctl.c.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/lm.c.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ondisk.c.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_file.c.diff?cvsroot=cluster&r1=1.24&r2=1.25

--- cluster/gfs-kernel/src/gfs/Makefile	2006/07/18 20:48:20	1.13
+++ cluster/gfs-kernel/src/gfs/Makefile	2006/08/11 14:32:32	1.14
@@ -68,9 +68,6 @@
 EXTRA_CFLAGS += -I$(obj) -I${incdir} -I/usr/include 
 
 all:
-	rm -f linux lm_interface.h
-	ln -s . linux
-	ln -s ${KERNEL_SRC}/fs/gfs2/lm_interface.h .
 	${MAKE} -C ${KERNEL_SRC} M=${PWD} symverfile=${SYMVERFILE} modules USING_KBUILD=yes
 
 install: all
@@ -84,9 +81,10 @@
 	${UNINSTALL} gfs_ondisk.h gfs_ioctl.h ${incdir}/linux
 
 clean:
-	rm -rf linux *.o .*.o.cmd .gfs.ko.cmd lm_interface.h \
+	rm -rf linux *.o .*.o.cmd .gfs.ko.cmd \
 		gfs.ko gfs.mod.c .tmp_versions *~ *~* Modules.symvers
 
+distclean: clean
 
 patches: pre add post
 
--- cluster/gfs-kernel/src/gfs/gfs.h	2006/07/10 23:22:34	1.10
+++ cluster/gfs-kernel/src/gfs/gfs.h	2006/08/11 14:32:32	1.11
@@ -16,9 +16,8 @@
 
 #define GFS_RELEASE_NAME "<CVS>"
 
-#include <linux/lm_interface.h>
-#include <linux/gfs_ondisk.h>
-
+#include "lm_interface.h"
+#include "gfs_ondisk.h"
 #include "fixed_div64.h"
 #include "lvb.h"
 #include "incore.h"
--- cluster/gfs-kernel/src/gfs/ioctl.c	2006/07/10 23:22:34	1.11
+++ cluster/gfs-kernel/src/gfs/ioctl.c	2006/08/11 14:32:32	1.12
@@ -19,8 +19,8 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <asm/uaccess.h>
-#include <linux/gfs_ioctl.h>
 
+#include "gfs_ioctl.h"
 #include "gfs.h"
 #include "bmap.h"
 #include "dio.h"
--- cluster/gfs-kernel/src/gfs/lm.c	2006/07/11 17:29:24	1.13
+++ cluster/gfs-kernel/src/gfs/lm.c	2006/08/11 14:32:32	1.14
@@ -13,8 +13,8 @@
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/delay.h>
-#include <linux/gfs_ondisk.h>
 
+#include "gfs_ondisk.h"
 #include "gfs.h"
 #include "lm_interface.h"
 #include "incore.h"
--- cluster/gfs-kernel/src/gfs/ondisk.c	2006/07/10 23:22:34	1.2
+++ cluster/gfs-kernel/src/gfs/ondisk.c	2006/08/11 14:32:32	1.3
@@ -24,5 +24,5 @@
 #define pv(struct, member, fmt) printk("  "#member" = "fmt"\n", struct->member);
 
 #define WANT_GFS_CONVERSION_FUNCTIONS
-#include <linux/gfs_ondisk.h>
+#include "gfs_ondisk.h"
 
--- cluster/gfs-kernel/src/gfs/ops_file.c	2006/07/10 23:22:34	1.24
+++ cluster/gfs-kernel/src/gfs/ops_file.c	2006/08/11 14:32:32	1.25
@@ -24,8 +24,8 @@
 #include <linux/blkdev.h>
 #include <linux/mm.h>
 #include <asm/uaccess.h>
-#include <linux/gfs_ioctl.h>
 
+#include "gfs_ioctl.h"
 #include "gfs.h"
 #include "bmap.h"
 #include "dio.h"