[Ocfs2-commits] jlbec commits r1801 - in trunk: . cluster src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-20 12:02:36 -0600 (Thu, 20 Jan 2005)
New Revision: 1801

Modified:
   trunk/Config.make.in
   trunk/cluster/tcp.c
   trunk/configure.in
   trunk/src/Makefile
Log:

o Move -DSUSE from KVER (where it doesn't belong) to a proper configure
  define.
o Fix a prototype in tcp.c



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-20 17:47:10 UTC (rev 1800)
+++ trunk/Config.make.in	2005-01-20 18:02:36 UTC (rev 1801)
@@ -1,4 +1,5 @@
 ifeq ($(KERNELRELEASE),)
+
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
@@ -42,6 +43,8 @@
 
 KERNEL_26 = @KERNEL_26@
 
+SUSE_KERNEL = @SUSE_KERNEL@
+
 KERNELDIR = @KERNELDIR@
 KERNELINC = $(KERNELDIR)/include
 KERNELVER = @KERNELVER@

Modified: trunk/cluster/tcp.c
===================================================================
--- trunk/cluster/tcp.c	2005-01-20 17:47:10 UTC (rev 1800)
+++ trunk/cluster/tcp.c	2005-01-20 18:02:36 UTC (rev 1801)
@@ -641,7 +641,7 @@
 
 
 /* net_handler_lock should be held */
-net_msg_handler * __net_lookup_handler(u32 msg_type, u32 key)
+static net_msg_handler * __net_lookup_handler(u32 msg_type, u32 key)
 {
 	net_msg_handler *ret;
 	struct list_head *iter;

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-20 17:47:10 UTC (rev 1800)
+++ trunk/configure.in	2005-01-20 18:02:36 UTC (rev 1801)
@@ -230,10 +230,12 @@
 fi
 
 KVER=
+AC_SUBST(KVER)
+
 if test "x$ulkernel" = "xyes"; then
-  KVER=suse
+  SUSE_KERNEL=yes
+  AC_SUBST(SUSE_KERNEL)
 fi
-AC_SUBST(KVER)
 
 AC_MSG_CHECKING([whether to build aio])
 if test "x$OCFS_AIO" = "xyes"; then

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2005-01-20 17:47:10 UTC (rev 1800)
+++ trunk/src/Makefile	2005-01-20 18:02:36 UTC (rev 1801)
@@ -42,6 +42,10 @@
 MODULE_DEFINES += -DOCFS_COMPAT_SAFE_WRITE
 endif
 
+ifdef SUSE_KERNEL
+MODULE_DEFINES += -DSUSE
+endif
+
 ifneq ($(QUIET),1)
 MODULE_DEFINES += -DVERBOSE_BH_JBD_TRACE
 MODULE_DEFINES += -DVERBOSE_LOCKING_TRACE