Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[pandora-kernel.git] / include / linux / nfs_page.h

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 92ce578..7d9096d 100644 (file)
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -22,12 +22,17 @@
  * Valid flags for a dirty buffer
  */
 enum {
-       PG_BUSY = 0,
-       PG_MAPPED,
-       PG_CLEAN,
-       PG_NEED_COMMIT,
-       PG_NEED_RESCHED,
-       PG_COMMIT_TO_DS,
+       PG_BUSY = 0,            /* nfs_{un}lock_request */
+       PG_MAPPED,              /* page private set for buffered io */
+       PG_CLEAN,               /* write succeeded */
+       PG_COMMIT_TO_DS,        /* used by pnfs layouts */
+       PG_INODE_REF,           /* extra ref held by inode (head req only) */
+       PG_HEADLOCK,            /* page group lock of wb_head */
+       PG_TEARDOWN,            /* page group sync for destroy */
+       PG_UNLOCKPAGE,          /* page group sync bit in read path */
+       PG_UPTODATE,            /* page group sync bit in read path */
+       PG_WB_END,              /* page group sync bit in write path */
+       PG_REMOVE,              /* page group sync bit in write path */
 };
 
 struct nfs_inode;
@@ -43,15 +48,29 @@ struct nfs_page {
        struct kref             wb_kref;        /* reference count */
        unsigned long           wb_flags;
        struct nfs_write_verifier       wb_verf;        /* Commit cookie */
+       struct nfs_page         *wb_this_page;  /* list of reqs for this page */
+       struct nfs_page         *wb_head;       /* head pointer for req list */
 };
 
 struct nfs_pageio_descriptor;
 struct nfs_pageio_ops {
        void    (*pg_init)(struct nfs_pageio_descriptor *, struct nfs_page *);
-       bool    (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
+       size_t  (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *,
+                          struct nfs_page *);
        int     (*pg_doio)(struct nfs_pageio_descriptor *);
 };
 
+struct nfs_rw_ops {
+       const fmode_t rw_mode;
+       struct nfs_rw_header *(*rw_alloc_header)(void);
+       void (*rw_free_header)(struct nfs_rw_header *);
+       void (*rw_release)(struct nfs_pgio_data *);
+       int  (*rw_done)(struct rpc_task *, struct nfs_pgio_data *, struct inode *);
+       void (*rw_result)(struct rpc_task *, struct nfs_pgio_data *);
+       void (*rw_initiate)(struct nfs_pgio_data *, struct rpc_message *,
+                           struct rpc_task_setup *, int);
+};
+
 struct nfs_pageio_descriptor {
        struct list_head        pg_list;
        unsigned long           pg_bytes_written;
@@ -63,6 +82,7 @@ struct nfs_pageio_descriptor {
 
        struct inode            *pg_inode;
        const struct nfs_pageio_ops *pg_ops;
+       const struct nfs_rw_ops *pg_rw_ops;
        int                     pg_ioflags;
        int                     pg_error;
        const struct rpc_call_ops *pg_rpc_callops;
@@ -75,29 +95,33 @@ struct nfs_pageio_descriptor {
 #define NFS_WBACK_BUSY(req)    (test_bit(PG_BUSY,&(req)->wb_flags))
 
 extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx,
-                                           struct inode *inode,
                                            struct page *page,
+                                           struct nfs_page *last,
                                            unsigned int offset,
                                            unsigned int count);
-extern void nfs_release_request(struct nfs_page *req);
+extern void nfs_release_request(struct nfs_page *);
 
 
 extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
                             struct inode *inode,
                             const struct nfs_pageio_ops *pg_ops,
                             const struct nfs_pgio_completion_ops *compl_ops,
+                            const struct nfs_rw_ops *rw_ops,
                             size_t bsize,
                             int how);
 extern int nfs_pageio_add_request(struct nfs_pageio_descriptor *,
                                   struct nfs_page *);
 extern void nfs_pageio_complete(struct nfs_pageio_descriptor *desc);
 extern void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *, pgoff_t);
-extern bool nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
+extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
                                struct nfs_page *prev,
                                struct nfs_page *req);
 extern  int nfs_wait_on_request(struct nfs_page *);
 extern void nfs_unlock_request(struct nfs_page *req);
-extern void nfs_unlock_and_release_request(struct nfs_page *req);
+extern void nfs_unlock_and_release_request(struct nfs_page *);
+extern void nfs_page_group_lock(struct nfs_page *);
+extern void nfs_page_group_unlock(struct nfs_page *);
+extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);
 
 /*
  * Lock the page of an asynchronous request