diff options
-rw-r--r-- | fs/dlm/dlm_internal.h | 2 | ||||
-rw-r--r-- | include/linux/dlm.h | 4 | ||||
-rw-r--r-- | include/linux/dlm_device.h | 3 | ||||
-rw-r--r-- | include/linux/dlmconstants.h | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index caa1581e158f..73c36f501707 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -43,8 +43,6 @@ #include <linux/dlm.h> #include "config.h" -#define DLM_LOCKSPACE_LEN 64 - /* Size of the temp buffer midcomms allocates on the stack. We try to make this large enough so most messages fit. FIXME: should sctp make this unnecessary? */ 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 */ |