Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / linux / dlm_device.h

diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h
index f8ba198..3060783 100644 (file)
--- a/include/linux/dlm_device.h
+++ b/include/linux/dlm_device.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
 **
 **  This copyrighted material is made available to anyone wishing to use,
 **  modify, copy, or redistribute it subject to the terms and conditions
@@ -11,58 +11,82 @@
 *******************************************************************************
 ******************************************************************************/
 
+#ifndef _LINUX_DLM_DEVICE_H
+#define _LINUX_DLM_DEVICE_H
+
 /* This is the device interface for dlm, most users will use a library
  * interface.
  */
 
+#include <linux/dlm.h>
+#include <linux/types.h>
+
 #define DLM_USER_LVB_LEN       32
 
 /* Version of the device interface */
-#define DLM_DEVICE_VERSION_MAJOR 4
+#define DLM_DEVICE_VERSION_MAJOR 6
 #define DLM_DEVICE_VERSION_MINOR 0
-#define DLM_DEVICE_VERSION_PATCH 0
+#define DLM_DEVICE_VERSION_PATCH 1
 
 /* struct passed to the lock write */
 struct dlm_lock_params {
        __u8 mode;
-       __u16 flags;
+       __u8 namelen;
+       __u16 unused;
+       __u32 flags;
        __u32 lkid;
        __u32 parent;
-       __u8 namelen;
-        void __user *castparam;
+       __u64 xid;
+       __u64 timeout;
+       void __user *castparam;
        void __user *castaddr;
        void __user *bastparam;
-        void __user *bastaddr;
+       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;
 };
 
+struct dlm_device_version {
+       __u32 version[3];
+};
+
 /* struct read from the "device" fd,
    consists mainly of userspace pointers for the library to use */
+
 struct dlm_lock_result {
+       __u32 version[3];
        __u32 length;
        void __user * user_astaddr;
        void __user * user_astparam;
        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,11 +97,12 @@ struct dlm_lock_result {
 #define DLM_USER_QUERY        3
 #define DLM_USER_CREATE_LOCKSPACE  4
 #define DLM_USER_REMOVE_LOCKSPACE  5
-
-/* Arbitrary length restriction */
-#define MAX_LS_NAME_LEN 64
+#define DLM_USER_PURGE        6
+#define DLM_USER_DEADLOCK     7
 
 /* Lockspace flags */
 #define DLM_USER_LSFLG_AUTOFREE   1
 #define DLM_USER_LSFLG_FORCEFREE  2
 
+#endif
+