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 @@ | |||
| 43 | #include <linux/dlm.h> | 43 | #include <linux/dlm.h> |
| 44 | #include "config.h" | 44 | #include "config.h" |
| 45 | 45 | ||
| 46 | #define DLM_LOCKSPACE_LEN 64 | ||
| 47 | |||
| 48 | /* Size of the temp buffer midcomms allocates on the stack. | 46 | /* Size of the temp buffer midcomms allocates on the stack. |
| 49 | We try to make this large enough so most messages fit. | 47 | We try to make this large enough so most messages fit. |
| 50 | FIXME: should sctp make this unnecessary? */ | 48 | 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 @@ | |||
| 22 | /* Lock levels and flags are here */ | 22 | /* Lock levels and flags are here */ |
| 23 | #include <linux/dlmconstants.h> | 23 | #include <linux/dlmconstants.h> |
| 24 | 24 | ||
| 25 | |||
| 26 | #define DLM_RESNAME_MAXLEN 64 | ||
| 27 | |||
| 28 | |||
| 29 | typedef void dlm_lockspace_t; | 25 | typedef void dlm_lockspace_t; |
| 30 | 26 | ||
| 31 | /* | 27 | /* |
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 { | |||
| 94 | #define DLM_USER_PURGE 6 | 94 | #define DLM_USER_PURGE 6 |
| 95 | #define DLM_USER_DEADLOCK 7 | 95 | #define DLM_USER_DEADLOCK 7 |
| 96 | 96 | ||
| 97 | /* Arbitrary length restriction */ | ||
| 98 | #define MAX_LS_NAME_LEN 64 | ||
| 99 | |||
| 100 | /* Lockspace flags */ | 97 | /* Lockspace flags */ |
| 101 | #define DLM_USER_LSFLG_AUTOFREE 1 | 98 | #define DLM_USER_LSFLG_AUTOFREE 1 |
| 102 | #define DLM_USER_LSFLG_FORCEFREE 2 | 99 | #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 @@ | |||
| 18 | * Constants used by DLM interface. | 18 | * Constants used by DLM interface. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #define DLM_LOCKSPACE_LEN 64 | ||
| 22 | #define DLM_RESNAME_MAXLEN 64 | ||
| 23 | |||
| 24 | |||
| 21 | /* | 25 | /* |
| 22 | * Lock Modes | 26 | * Lock Modes |
| 23 | */ | 27 | */ |
