Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 0d9d225..995f89d 100644 (file)
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -14,6 +14,7 @@
 #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>
@@ -58,6 +59,8 @@ struct nlm_host {
        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 */
 };
 
 /*
@@ -72,6 +75,8 @@ struct nlm_lockowner {
        uint32_t pid;
 };
 
+struct nlm_wait;
+
 /*
  * Memory chunk for NLM client RPC request.
  */
@@ -81,7 +86,9 @@ struct nlm_rqst {
        struct nlm_host *       a_host;         /* host handle */
        struct nlm_args         a_args;         /* arguments */
        struct nlm_res          a_res;          /* result */
-       char                    a_owner[NLMCLNT_OHSIZE];
+       struct nlm_block *      a_block;
+       unsigned int            a_retries;      /* Retry count */
+       u8                      a_owner[NLMCLNT_OHSIZE];
 };
 
 /*
@@ -106,16 +113,16 @@ 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 */
 };
@@ -141,14 +148,16 @@ extern unsigned long              nlmsvc_timeout;
 /*
  * Lockd client functions
  */
-struct nlm_rqst * nlmclnt_alloc_call(void);
-int              nlmclnt_block(struct nlm_host *, struct file_lock *, u32 *);
-int              nlmclnt_cancel(struct nlm_host *, struct file_lock *);
-u32              nlmclnt_grant(struct nlm_lock *);
+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);
+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
@@ -167,7 +176,6 @@ extern struct nlm_host *nlm_find_client(void);
 /*
  * Server-side lock handling
  */
-int              nlmsvc_async_call(struct nlm_rqst *, u32, rpc_action);
 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 *);
@@ -175,7 +183,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);
-int              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
+void             nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                        int action);
 void     nlmsvc_grant_reply(struct svc_rqst *, struct nlm_cookie *, u32);
 
@@ -199,7 +207,7 @@ nlmsvc_file_inode(struct nlm_file *file)
  * Compare two host addresses (needs modifying for ipv6)
  */
 static __inline__ int
-nlm_cmp_addr(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
+nlm_cmp_addr(const struct sockaddr_in *sin1, const struct sockaddr_in *sin2)
 {
        return sin1->sin_addr.s_addr == sin2->sin_addr.s_addr;
 }
@@ -209,7 +217,7 @@ nlm_cmp_addr(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
  * When the second lock is of type F_UNLCK, this acts like a wildcard.
  */
 static __inline__ int
-nlm_compare_locks(struct file_lock *fl1, struct file_lock *fl2)
+nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2)
 {
        return  fl1->fl_pid   == fl2->fl_pid
             && fl1->fl_start == fl2->fl_start