Cluster Project branch, master, updated. gfs-kernel_0_1_22-206-g0083f20

Cluster Project branch, master, updated. gfs-kernel_0_1_22-206-g0083f20

[teigland]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=0083f20653ffa93bbbfc107d4a4f5d56bfae0252

The branch, master has been updated
       via  0083f20653ffa93bbbfc107d4a4f5d56bfae0252 (commit)
      from  cf4f0831a1afdc055062f1ee1ed1629e271d1302 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0083f20653ffa93bbbfc107d4a4f5d56bfae0252
Author: David Teigland <teigland@redhat.com>
Date:   Thu Apr 24 09:46:15 2008 -0500

    dlm_controld: build plock code
    
    Building this requires 2.6.26-rc kernels because of linux/dlm_plock.h.
    Once built, dlm_controld is backward compatible, and will process plocks
    from earlier kernel versions.
    
    Signed-off-by: David Teigland <teigland@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 group/dlm_controld/main.c  |    2 --
 group/dlm_controld/plock.c |    7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index 095cf8f..7a5ce81 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -548,13 +548,11 @@ static int loop(void)
 			setup_deadlock();
 		}
 
-#ifdef EXPERIMENTAL_BUILD
 		rv = setup_plocks();
 		if (rv < 0)
 			goto out;
 		plock_fd = rv;
 		plock_ci = client_add(rv, process_plocks, NULL);
-#endif /* EXPERIMENTAL_BUILD */
 	}
 
 	for (;;) {
diff --git a/group/dlm_controld/plock.c b/group/dlm_controld/plock.c
index 5f8d4ce..648e9ec 100644
--- a/group/dlm_controld/plock.c
+++ b/group/dlm_controld/plock.c
@@ -13,7 +13,6 @@
 #include "dlm_daemon.h"
 #include "config.h"
 
-#ifdef EXPERIMENTAL_BUILD
 #include <linux/dlm_plock.h>
 
 #define PROC_MISC               "/proc/misc"
@@ -2295,7 +2294,8 @@ int dump_plocks(char *name, int fd)
 	return 0;
 }
 
-#else /* EXPERIMENTAL_BUILD */
+#if 0
+/* replace all of the above with this to build on 2.6.25 kernels */
 
 int setup_plocks(void) { return 0; };
 void process_plocks(int ci) { };
@@ -2311,4 +2311,5 @@ void retrieve_plocks(struct lockspace *ls) { };
 void purge_plocks(struct lockspace *ls, int nodeid, int unmount) { };
 int dump_plocks(char *name, int fd) { return 0; };
 
-#endif /* EXPERIMENTAL_BUILD */
+#endif
+


hooks/post-receive
--
Cluster Project