Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / include / linux / dlm_device.h

diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index f8ba198..c2735ca 100644 (file)
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -18,39 +18,47 @@
 #define DLM_USER_LVB_LEN       32
 
 /* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 4
-#define DLM_DEVICE_VERSION_MINOR 0
+#define DLM_DEVICE_VERSION_MAJOR 5
+#define DLM_DEVICE_VERSION_MINOR 1
 #define DLM_DEVICE_VERSION_PATCH 0
 
 /* struct passed to the lock write */
 struct dlm_lock_params {
        __u8 mode;
+       __u8 namelen;
        __u16 flags;
        __u32 lkid;
        __u32 parent;
-       __u8 namelen;
         void __user *castparam;
        void __user *castaddr;
        void __user *bastparam;
         void __user *bastaddr;
        struct dlm_lksb __user *lksb;
        char lvb[DLM_USER_LVB_LEN];
-       char name[1];
+       char name[0];
 };
 
 struct dlm_lspace_params {
        __u32 flags;
        __u32 minor;
-       char name[1];
+       char name[0];
+};
+
+struct dlm_purge_params {
+       __u32 nodeid;
+       __u32 pid;
 };
 
 struct dlm_write_request {
        __u32 version[3];
        __u8 cmd;
+       __u8 is64bit;
+       __u8 unused[2];
 
        union  {
                struct dlm_lock_params   lock;
                struct dlm_lspace_params lspace;
+               struct dlm_purge_params  purge;
        } i;
 };
 
@@ -63,6 +71,7 @@ struct dlm_lock_result {
        struct dlm_lksb __user * user_lksb;
        struct dlm_lksb lksb;
        __u8 bast_mode;
+       __u8 unused[3];
        /* Offsets may be zero if no data is present */
        __u32 lvb_offset;
 };
@@ -73,6 +82,7 @@ struct dlm_lock_result {
 #define DLM_USER_QUERY        3
 #define DLM_USER_CREATE_LOCKSPACE  4
 #define DLM_USER_REMOVE_LOCKSPACE  5
+#define DLM_USER_PURGE        6
 
 /* Arbitrary length restriction */
 #define MAX_LS_NAME_LEN 64