Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 14 insertions, 4 deletions

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index f8b60e7f4c44..25311b3bedf8 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -29,14 +29,19 @@
  */
 enum {
         PG_BUSY = 0,
+        PG_MAPPED,
         PG_CLEAN,
         PG_NEED_COMMIT,
         PG_NEED_RESCHED,
+        PG_PNFS_COMMIT,
 };
 
 struct nfs_inode;
 struct nfs_page {
-        struct list_head        wb_list;        /* Defines state of page: */
+        union {
+                struct list_head        wb_list;        /* Defines state of page: */
+                struct pnfs_layout_segment *wb_commit_lseg; /* Used when PG_PNFS_COMMIT set */
+        };
         struct page             *wb_page;       /* page to read in/write out */
         struct nfs_open_context *wb_context;    /* File state context info */
         struct nfs_lock_context *wb_lock_context;       /* lock context info */
@@ -56,11 +61,14 @@ struct nfs_pageio_descriptor {
         size_t                  pg_count;
         size_t                  pg_bsize;
         unsigned int            pg_base;
+        char                    pg_moreio;
 
         struct inode            *pg_inode;
-        int                     (*pg_doio)(struct inode *, struct list_head *, unsigned int, size_t, int);
+        int                     (*pg_doio)(struct nfs_pageio_descriptor *);
         int                     pg_ioflags;
         int                     pg_error;
+        struct pnfs_layout_segment *pg_lseg;
+        bool                    (*pg_test)(struct nfs_pageio_descriptor *, struct nfs_page *, struct nfs_page *);
 };
 
 #define NFS_WBACK_BUSY(req)     (test_bit(PG_BUSY,&(req)->wb_flags))
@@ -70,7 +78,6 @@ extern	struct nfs_page *nfs_create_request(struct nfs_open_context *ctx,
                                             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);
 
 
@@ -78,13 +85,16 @@ extern	int nfs_scan_list(struct nfs_inode *nfsi, struct list_head *dst,
                           pgoff_t idx_start, unsigned int npages, int tag);
 extern  void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
                              struct inode *inode,
-                             int (*doio)(struct inode *, struct list_head *, unsigned int, size_t, int),
+                             int (*doio)(struct nfs_pageio_descriptor *desc),
                              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,
+                                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  int nfs_set_page_tag_locked(struct nfs_page *req);