X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fdlm_device.h;h=2a2dd189b9fd3d3f142c8b9cea876e9c0f7b76ba;hb=363e065c02b1273364d5356711a83e7f548fc0c8;hp=5e17d295544b3c69366befeb12bf90fb5ef5fa07;hpb=044399b2cb6ad2d7f63cfca945268853d7443a4d;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index 5e17d295544..2a2dd189b9f 100644
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -18,36 +18,37 @@
 #define DLM_USER_LVB_LEN	32
 
 /* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 3
+#define DLM_DEVICE_VERSION_MAJOR 5
 #define DLM_DEVICE_VERSION_MINOR 0
 #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;
-	struct dlm_range range;
-	__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_write_request {
 	__u32 version[3];
 	__u8 cmd;
+	__u8 is64bit;
+	__u8 unused[2];
 
 	union  {
 		struct dlm_lock_params   lock;
@@ -64,6 +65,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;
 };