dlm: common max length definitions

Add central definitions for max lockspace name length and max resource
name length.  The lack of central definitions has resulted in scattered
private definitions which we can now clean up, including an unused one
in dlm_device.h.

Signed-off-by: David Teigland <teigland@redhat.com>

3 files changed, 4 insertions, 7 deletions

diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index c743fbc769db..188f6e6925a0 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -22,10 +22,6 @@
 /* Lock levels and flags are here */
 #include <linux/dlmconstants.h>
 
-
-#define DLM_RESNAME_MAXLEN	64
-
-
 typedef void dlm_lockspace_t;
 
 /*
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index 9642277a152a..dcfd2499902f 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -94,9 +94,6 @@ struct dlm_lock_result {
 #define DLM_USER_PURGE        6
 #define DLM_USER_DEADLOCK     7
 
-/* Arbitrary length restriction */
-#define MAX_LS_NAME_LEN 64
-
 /* Lockspace flags */
 #define DLM_USER_LSFLG_AUTOFREE   1
 #define DLM_USER_LSFLG_FORCEFREE  2
diff --git a/include/linux/dlmconstants.h b/include/linux/dlmconstants.h
index fddb3d3ff321..47bf08dc7566 100644
--- a/include/linux/dlmconstants.h
+++ b/include/linux/dlmconstants.h
@@ -18,6 +18,10 @@
  * Constants used by DLM interface.
  */
 
+#define DLM_LOCKSPACE_LEN       64
+#define DLM_RESNAME_MAXLEN      64
+
+
 /*
  * Lock Modes
  */