[Cluster-devel] cluster/gfs-kernel/src/gfs Makefile ops_inode.c
teigland at sourceware.org
teigland at sourceware.org
Wed Aug 16 14:40:55 UTC 2006
CVSROOT: /cvs/cluster
Module name: cluster
Branch: STABLE
Changes by: teigland at sourceware.org 2006-08-16 14:40:54
Modified files:
gfs-kernel/src/gfs: Makefile ops_inode.c
Log message:
Now that gfs is using cman (with the recent CDPN patch), we need some
Makefile hacks to get the headers included so it'll build.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/Makefile.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.6.2.3.6.2&r2=1.6.2.3.6.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/gfs-kernel/src/gfs/ops_inode.c.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.6.6.1.2.4&r2=1.6.6.1.2.5
--- cluster/gfs-kernel/src/gfs/Makefile 2006/05/08 21:31:20 1.6.2.3.6.2
+++ cluster/gfs-kernel/src/gfs/Makefile 2006/08/16 14:40:54 1.6.2.3.6.3
@@ -69,6 +69,9 @@
EXTRA_CFLAGS += -I$(obj) -I${incdir} -I/usr/include
all:
+ if [ ! -e cluster ]; then ln -s . cluster; fi
+ if [ ! -e cnxman.h ]; then cp ${incdir}/cluster/cnxman.h .; fi
+ if [ ! -e cnxman-socket.h ]; then cp ${incdir}/cluster/cnxman-socket.h .; fi
rm -f linux lm_interface.h
ln -s . linux
ln -s ${top_srcdir}/src/harness/lm_interface.h .
@@ -86,7 +89,7 @@
clean:
rm -rf linux *.o .*.o.cmd .gfs.ko.cmd lm_interface.h \
- gfs.ko gfs.mod.c .tmp_versions *~
+ cluster cnxman.h cnxman-socket.h gfs.ko gfs.mod.c .tmp_versions *~
patches: pre add post
--- cluster/gfs-kernel/src/gfs/ops_inode.c 2006/04/20 22:35:39 1.6.6.1.2.4
+++ cluster/gfs-kernel/src/gfs/ops_inode.c 2006/08/16 14:40:54 1.6.6.1.2.5
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/xattr.h>
#include <linux/posix_acl.h>
+#include <net/sock.h>
#include <cluster/cnxman.h>
#include "gfs.h"
More information about the Cluster-devel
mailing list