aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-04-14 15:06:29 -0400
committerDavid Teigland <teigland@redhat.com>2008-04-21 12:22:29 -0400
commit3d564fa3472d36cd6aa70514c37b8bbbec5b17ab (patch)
tree1033829746e0440e3b603381b9ed640a0af1ec2a
parent2402211a8389282fd2942fad4511f02c0eeeffc5 (diff)
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>
-rw-r--r--fs/dlm/dlm_internal.h2
-rw-r--r--include/linux/dlm.h4
-rw-r--r--include/linux/dlm_device.h3
-rw-r--r--include/linux/dlmconstants.h4
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
29typedef void dlm_lockspace_t; 25typedef 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 */