Browse Source

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>
David Teigland 17 years ago
parent
commit
3d564fa347
4 changed files with 4 additions and 9 deletions
  1. 0 2
      fs/dlm/dlm_internal.h
  2. 0 4
      include/linux/dlm.h
  3. 0 3
      include/linux/dlm_device.h
  4. 4 0
      include/linux/dlmconstants.h

+ 0 - 2
fs/dlm/dlm_internal.h

@@ -43,8 +43,6 @@
 #include <linux/dlm.h>
 #include <linux/dlm.h>
 #include "config.h"
 #include "config.h"
 
 
-#define DLM_LOCKSPACE_LEN	64
-
 /* Size of the temp buffer midcomms allocates on the stack.
 /* Size of the temp buffer midcomms allocates on the stack.
    We try to make this large enough so most messages fit.
    We try to make this large enough so most messages fit.
    FIXME: should sctp make this unnecessary? */
    FIXME: should sctp make this unnecessary? */

+ 0 - 4
include/linux/dlm.h

@@ -22,10 +22,6 @@
 /* Lock levels and flags are here */
 /* Lock levels and flags are here */
 #include <linux/dlmconstants.h>
 #include <linux/dlmconstants.h>
 
 
-
-#define DLM_RESNAME_MAXLEN	64
-
-
 typedef void dlm_lockspace_t;
 typedef void dlm_lockspace_t;
 
 
 /*
 /*

+ 0 - 3
include/linux/dlm_device.h

@@ -94,9 +94,6 @@ struct dlm_lock_result {
 #define DLM_USER_PURGE        6
 #define DLM_USER_PURGE        6
 #define DLM_USER_DEADLOCK     7
 #define DLM_USER_DEADLOCK     7
 
 
-/* Arbitrary length restriction */
-#define MAX_LS_NAME_LEN 64
-
 /* Lockspace flags */
 /* Lockspace flags */
 #define DLM_USER_LSFLG_AUTOFREE   1
 #define DLM_USER_LSFLG_AUTOFREE   1
 #define DLM_USER_LSFLG_FORCEFREE  2
 #define DLM_USER_LSFLG_FORCEFREE  2

+ 4 - 0
include/linux/dlmconstants.h

@@ -18,6 +18,10 @@
  * Constants used by DLM interface.
  * Constants used by DLM interface.
  */
  */
 
 
+#define DLM_LOCKSPACE_LEN       64
+#define DLM_RESNAME_MAXLEN      64
+
+
 /*
 /*
  * Lock Modes
  * Lock Modes
  */
  */