dlm: allow multiple lockspace creates

[linux-2.6-omap-h63xx.git] / fs / dlm / dlm_internal.h

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index ec61bbaf25dfdae4cc6d56ec7acff1b50e71c4ff..9e0622aff496b00e534599fdbef895f49d97dfb9 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -2,7 +2,7 @@
 *******************************************************************************
 **
 **  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-**  Copyright (C) 2004-2007 Red Hat, Inc.  All rights reserved.
+**  Copyright (C) 2004-2008 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
@@ -37,14 +37,11 @@
 #include <linux/jhash.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #include <linux/dlm.h>
 #include "config.h"
 
-#define DLM_LOCKSPACE_LEN      64
-
 /* Size of the temp buffer midcomms allocates on the stack.
    We try to make this large enough so most messages fit.
    FIXME: should sctp make this unnecessary? */
@@ -92,8 +89,6 @@ do { \
   } \
 }
 
-#define DLM_FAKE_USER_AST ERR_PTR(-EINVAL)
-
 
 struct dlm_direntry {
        struct list_head        list;
@@ -135,8 +130,10 @@ struct dlm_member {
 
 struct dlm_recover {
        struct list_head        list;
-       int                     *nodeids;
+       int                     *nodeids;   /* nodeids of all members */
        int                     node_count;
+       int                     *new;       /* nodeids of new members */
+       int                     new_count;
        uint64_t                seq;
 };
 
@@ -146,9 +143,9 @@ struct dlm_recover {
 
 struct dlm_args {
        uint32_t                flags;
-       void                    *astaddr;
-       long                    astparam;
-       void                    *bastaddr;
+       void                    (*astfn) (void *astparam);
+       void                    *astparam;
+       void                    (*bastfn) (void *astparam, int mode);
        int                     mode;
        struct dlm_lksb         *lksb;
        unsigned long           timeout;
@@ -253,9 +250,12 @@ struct dlm_lkb {
 
        char                    *lkb_lvbptr;
        struct dlm_lksb         *lkb_lksb;      /* caller's status block */
-       void                    *lkb_astaddr;   /* caller's ast function */
-       void                    *lkb_bastaddr;  /* caller's bast function */
-       long                    lkb_astparam;   /* caller's ast arg */
+       void                    (*lkb_astfn) (void *astparam);
+       void                    (*lkb_bastfn) (void *astparam, int mode);
+       union {
+               void                    *lkb_astparam;  /* caller's ast arg */
+               struct dlm_user_args    *lkb_ua;
+       };
 };
 
 
@@ -403,28 +403,34 @@ struct dlm_rcom {
        char                    rc_buf[0];
 };
 
+union dlm_packet {
+       struct dlm_header       header;         /* common to other two */
+       struct dlm_message      message;
+       struct dlm_rcom         rcom;
+};
+
 struct rcom_config {
-       uint32_t                rf_lvblen;
-       uint32_t                rf_lsflags;
-       uint64_t                rf_unused;
+       __le32                  rf_lvblen;
+       __le32                  rf_lsflags;
+       __le64                  rf_unused;
 };
 
 struct rcom_lock {
-       uint32_t                rl_ownpid;
-       uint32_t                rl_lkid;
-       uint32_t                rl_remid;
-       uint32_t                rl_parent_lkid;
-       uint32_t                rl_parent_remid;
-       uint32_t                rl_exflags;
-       uint32_t                rl_flags;
-       uint32_t                rl_lvbseq;
-       int                     rl_result;
+       __le32                  rl_ownpid;
+       __le32                  rl_lkid;
+       __le32                  rl_remid;
+       __le32                  rl_parent_lkid;
+       __le32                  rl_parent_remid;
+       __le32                  rl_exflags;
+       __le32                  rl_flags;
+       __le32                  rl_lvbseq;
+       __le32                  rl_result;
        int8_t                  rl_rqmode;
        int8_t                  rl_grmode;
        int8_t                  rl_status;
        int8_t                  rl_asts;
-       uint16_t                rl_wait_type;
-       uint16_t                rl_namelen;
+       __le16                  rl_wait_type;
+       __le16                  rl_namelen;
        char                    rl_name[DLM_RESNAME_MAXLEN];
        char                    rl_lvb[0];
 };
@@ -435,7 +441,9 @@ struct dlm_ls {
        uint32_t                ls_global_id;   /* global unique lockspace ID */
        uint32_t                ls_exflags;
        int                     ls_lvblen;
-       int                     ls_count;       /* reference count */
+       int                     ls_count;       /* refcount of processes in
+                                                  the dlm using this ls */
+       int                     ls_create_count; /* create/release refcount */
        unsigned long           ls_flags;       /* LSFL_ */
        struct kobject          ls_kobj;
 
@@ -494,7 +502,7 @@ struct dlm_ls {
        struct rw_semaphore     ls_recv_active; /* block dlm_recv */
        struct list_head        ls_requestqueue;/* queue remote requests */
        struct mutex            ls_requestqueue_mutex;
-       char                    *ls_recover_buf;
+       struct dlm_rcom         *ls_recover_buf;
        int                     ls_recover_nodeid; /* for debugging */
        uint64_t                ls_rcom_seq;
        spinlock_t              ls_rcom_spin;
@@ -573,6 +581,8 @@ static inline int dlm_no_directory(struct dlm_ls *ls)
 int dlm_netlink_init(void);
 void dlm_netlink_exit(void);
 void dlm_timeout_warn(struct dlm_lkb *lkb);
+int dlm_plock_init(void);
+void dlm_plock_exit(void);
 
 #ifdef CONFIG_DLM_DEBUG
 int dlm_register_debugfs(void);