linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / lockd / lockd.h

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 0d92c46..ef21ed2 100644 (file)
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -11,9 +11,9 @@
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <linux/in.h>
 #include <linux/fs.h>
-#include <linux/kref.h>
 #include <linux/utsname.h>
 #include <linux/nfsd/nfsfh.h>
 #include <linux/lockd/bind.h>
@@ -49,18 +49,15 @@ struct nlm_host {
                                h_killed     : 1,
                                h_monitored  : 1;
        wait_queue_head_t       h_gracewait;    /* wait while reclaiming */
-       struct rw_semaphore     h_rwsem;        /* Reboot recovery lock */
        u32                     h_state;        /* pseudo-state counter */
        u32                     h_nsmstate;     /* true remote NSM state */
        u32                     h_pidcount;     /* Pseudopids */
        atomic_t                h_count;        /* reference count */
-       struct mutex            h_mutex;        /* mutex for pmap binding */
+       struct semaphore        h_sema;         /* mutex for pmap binding */
        unsigned long           h_nextrebind;   /* next portmap call */
        unsigned long           h_expires;      /* eligible for GC */
        struct list_head        h_lockowners;   /* Lockowners for the client */
        spinlock_t              h_lock;
-       struct list_head        h_granted;      /* Locks in GRANTED state */
-       struct list_head        h_reclaim;      /* Locks in RECLAIM state */
 };
 
 /*
@@ -86,9 +83,9 @@ struct nlm_rqst {
        struct nlm_host *       a_host;         /* host handle */
        struct nlm_args         a_args;         /* arguments */
        struct nlm_res          a_res;          /* result */
-       struct nlm_block *      a_block;
+       struct nlm_wait *       a_block;
        unsigned int            a_retries;      /* Retry count */
-       u8                      a_owner[NLMCLNT_OHSIZE];
+       char                    a_owner[NLMCLNT_OHSIZE];
 };
 
 /*
@@ -113,16 +110,17 @@ struct nlm_file {
  */
 #define NLM_NEVER              (~(unsigned long) 0)
 struct nlm_block {
-       struct kref             b_count;        /* Reference count */
        struct nlm_block *      b_next;         /* linked list (all blocks) */
        struct nlm_block *      b_fnext;        /* linked list (per file) */
-       struct nlm_rqst *       b_call;         /* RPC args & callback info */
+       struct nlm_rqst         b_call;         /* RPC args & callback info */
        struct svc_serv *       b_daemon;       /* NLM service */
        struct nlm_host *       b_host;         /* host handle for RPC clnt */
        unsigned long           b_when;         /* next re-xmit */
        unsigned int            b_id;           /* block id */
        unsigned char           b_queued;       /* re-queued */
        unsigned char           b_granted;      /* VFS granted lock */
+       unsigned char           b_incall;       /* doing callback */
+       unsigned char           b_done;         /* callback complete */
        struct nlm_file *       b_file;         /* file in question */
 };
 
@@ -147,16 +145,15 @@ extern unsigned long              nlmsvc_timeout;
 /*
  * Lockd client functions
  */
-struct nlm_rqst * nlm_alloc_call(struct nlm_host *host);
-void             nlm_release_call(struct nlm_rqst *);
-int              nlm_async_call(struct nlm_rqst *, u32, const struct rpc_call_ops *);
-int              nlm_async_reply(struct nlm_rqst *, u32, const struct rpc_call_ops *);
-struct nlm_wait * nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *fl);
-void             nlmclnt_finish_block(struct nlm_wait *block);
-int              nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout);
+struct nlm_rqst * nlmclnt_alloc_call(void);
+int              nlmclnt_prepare_block(struct nlm_rqst *req, struct nlm_host *host, struct file_lock *fl);
+void             nlmclnt_finish_block(struct nlm_rqst *req);
+long             nlmclnt_block(struct nlm_rqst *req, long timeout);
 u32              nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *);
 void             nlmclnt_recovery(struct nlm_host *, u32);
 int              nlmclnt_reclaim(struct nlm_host *, struct file_lock *);
+int              nlmclnt_setgrantargs(struct nlm_rqst *, struct nlm_lock *);
+void             nlmclnt_freegrantargs(struct nlm_rqst *);
 
 /*
  * Host cache
@@ -175,6 +172,7 @@ extern struct nlm_host *nlm_find_client(void);
 /*
  * Server-side lock handling
  */
+int              nlmsvc_async_call(struct nlm_rqst *, u32, const struct rpc_call_ops *);
 u32              nlmsvc_lock(struct svc_rqst *, struct nlm_file *,
                                        struct nlm_lock *, int, struct nlm_cookie *);
 u32              nlmsvc_unlock(struct nlm_file *, struct nlm_lock *);
@@ -182,7 +180,7 @@ u32           nlmsvc_testlock(struct nlm_file *, struct nlm_lock *,
                                        struct nlm_lock *);
 u32              nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long    nlmsvc_retry_blocked(void);
-void             nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
+int              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                        int action);
 void     nlmsvc_grant_reply(struct svc_rqst *, struct nlm_cookie *, u32);
 
@@ -219,7 +217,6 @@ static __inline__ int
 nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2)
 {
        return  fl1->fl_pid   == fl2->fl_pid
-            && fl1->fl_owner == fl2->fl_owner
             && fl1->fl_start == fl2->fl_start
             && fl1->fl_end   == fl2->fl_end
             &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);