- avoid local_nodeid conflict with ia64/numa define

Changed files:
    linux-cluster-dlm.patch -> 1.2

diff --git a/linux-cluster-dlm.patch b/linux-cluster-dlm.patch
index 5f51760416412d28f614b856aa6eb50e3b07ca91..65da540363d2768ea84af8dc41e95efd1870357c 100644 (file)
--- a/linux-cluster-dlm.patch
+++ b/linux-cluster-dlm.patch
@@ -8443,7 +8443,7 @@ diff -urN linux-orig/cluster/dlm/nodes.c linux-patched/cluster/dlm/nodes.c
 +
 +static struct list_head cluster_nodes;
 +static spinlock_t node_lock;
-+static uint32_t local_nodeid;
++static uint32_t dlm_local_nodeid;
 +static struct semaphore local_init_lock;
 +
 +
@@ -8451,7 +8451,7 @@ diff -urN linux-orig/cluster/dlm/nodes.c linux-patched/cluster/dlm/nodes.c
 +{
 +      INIT_LIST_HEAD(&cluster_nodes);
 +      spin_lock_init(&node_lock);
-+      local_nodeid = 0;
++      dlm_local_nodeid = 0;
 +      init_MUTEX(&local_init_lock);
 +}
 +
@@ -8544,9 +8544,9 @@ diff -urN linux-orig/cluster/dlm/nodes.c linux-patched/cluster/dlm/nodes.c
 +
 +      down(&local_init_lock);
 +
-+      if (!local_nodeid) {
++      if (!dlm_local_nodeid) {
 +              if (nodeid == our_nodeid()) {
-+                      local_nodeid = node->gn_nodeid;
++                      dlm_local_nodeid = node->gn_nodeid;
 +              }
 +      }
 +      up(&local_init_lock);