vserver 1.9.3

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

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 4545871..39e4895 100644 (file)
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -29,19 +29,14 @@
 struct nfs_page {
        struct list_head        wb_list,        /* Defines state of page: */
                                *wb_list_head;  /*      read/write/commit */
-       struct file             *wb_file;
-       fl_owner_t              wb_lockowner;
-       struct inode            *wb_inode;
-       struct rpc_cred         *wb_cred;
-       struct nfs4_state       *wb_state;
        struct page             *wb_page;       /* page to read in/write out */
+       struct nfs_open_context *wb_context;    /* File state context info */
        atomic_t                wb_complete;    /* i/os we're waiting for */
-       wait_queue_head_t       wb_wait;        /* wait queue */
        unsigned long           wb_index;       /* Offset >> PAGE_CACHE_SHIFT */
        unsigned int            wb_offset,      /* Offset & ~PAGE_CACHE_MASK */
                                wb_pgbase,      /* Start of page data */
-                               wb_bytes,       /* Length of request */
-                               wb_count;       /* reference count */
+                               wb_bytes;       /* Length of request */
+       atomic_t                wb_count;       /* reference count */
        unsigned long           wb_flags;
        struct nfs_writeverf    wb_verf;        /* Commit cookie */
 };
@@ -50,9 +45,11 @@ struct nfs_page {
 #define NFS_NEED_COMMIT(req)   (test_bit(PG_NEED_COMMIT,&(req)->wb_flags))
 #define NFS_NEED_RESCHED(req)  (test_bit(PG_NEED_RESCHED,&(req)->wb_flags))
 
-extern struct nfs_page *nfs_create_request(struct file *, struct inode *,
-                                           struct page *,
-                                           unsigned int, unsigned int);
+extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx,
+                                           struct inode *inode,
+                                           struct page *page,
+                                           unsigned int offset,
+                                           unsigned int count);
 extern void nfs_clear_request(struct nfs_page *req);
 extern void nfs_release_request(struct nfs_page *req);
 
@@ -64,8 +61,7 @@ extern        int nfs_scan_list(struct list_head *, struct list_head *,
 extern int nfs_coalesce_requests(struct list_head *, struct list_head *,
                                  unsigned int);
 extern  int nfs_wait_on_request(struct nfs_page *);
-
-extern spinlock_t nfs_wreq_lock;
+extern void nfs_unlock_request(struct nfs_page *req);
 
 /*
  * Lock the page of an asynchronous request without incrementing the wb_count
@@ -86,23 +82,10 @@ nfs_lock_request(struct nfs_page *req)
 {
        if (test_and_set_bit(PG_BUSY, &req->wb_flags))
                return 0;
-       req->wb_count++;
+       atomic_inc(&req->wb_count);
        return 1;
 }
 
-static inline void
-nfs_unlock_request(struct nfs_page *req)
-{
-       if (!NFS_WBACK_BUSY(req)) {
-               printk(KERN_ERR "NFS: Invalid unlock attempted\n");
-               BUG();
-       }
-       smp_mb__before_clear_bit();
-       clear_bit(PG_BUSY, &req->wb_flags);
-       smp_mb__after_clear_bit();
-       wake_up_all(&req->wb_wait);
-       nfs_release_request(req);
-}
 
 /**
  * nfs_list_remove_request - Remove a request from its wb_list