8 files changed, 34 insertions, 35 deletions

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index e30f6059ecd6..5180a7ededec 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -52,6 +52,7 @@ struct nfs_access_entry {
         unsigned long           jiffies;
         struct rpc_cred *       cred;
         int                     mask;
+        struct rcu_head         rcu_head;
 };
 
 struct nfs_lockowner {
@@ -352,6 +353,7 @@ extern int nfs_release(struct inode *, struct file *);
 extern int nfs_attribute_timeout(struct inode *inode);
 extern int nfs_attribute_cache_expired(struct inode *inode);
 extern int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode);
+extern int nfs_revalidate_inode_rcu(struct nfs_server *server, struct inode *inode);
 extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
 extern int nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping);
 extern int nfs_setattr(struct dentry *, struct iattr *);
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 1150ea41b626..922be2e050f5 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -45,6 +45,7 @@ struct nfs_client {
         struct sockaddr_storage cl_addr;        /* server identifier */
         size_t                  cl_addrlen;
         char *                  cl_hostname;    /* hostname of server */
+        char *                  cl_acceptor;    /* GSSAPI acceptor name */
         struct list_head        cl_share_link;  /* link in global client list */
         struct list_head        cl_superblocks; /* List of nfs_server structs */
 
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index 7d9096d95d4a..6ad2bbcad405 100644
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -26,7 +26,7 @@ enum {
         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_INODE_REF,           /* extra ref held by inode when in writeback */
         PG_HEADLOCK,            /* page group lock of wb_head */
         PG_TEARDOWN,            /* page group sync for destroy */
         PG_UNLOCKPAGE,          /* page group sync bit in read path */
@@ -62,12 +62,13 @@ struct nfs_pageio_ops {
 
 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 nfs_pgio_header *(*rw_alloc_header)(void);
+        void (*rw_free_header)(struct nfs_pgio_header *);
+        void (*rw_release)(struct nfs_pgio_header *);
+        int  (*rw_done)(struct rpc_task *, struct nfs_pgio_header *,
+                        struct inode *);
+        void (*rw_result)(struct rpc_task *, struct nfs_pgio_header *);
+        void (*rw_initiate)(struct nfs_pgio_header *, struct rpc_message *,
                             struct rpc_task_setup *, int);
 };
 
@@ -111,6 +112,8 @@ extern	void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
                              int how);
 extern  int nfs_pageio_add_request(struct nfs_pageio_descriptor *,
                                    struct nfs_page *);
+extern  int nfs_pageio_resend(struct nfs_pageio_descriptor *,
+                              struct nfs_pgio_header *);
 extern  void nfs_pageio_complete(struct nfs_pageio_descriptor *desc);
 extern  void nfs_pageio_cond_complete(struct nfs_pageio_descriptor *, pgoff_t);
 extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
@@ -119,7 +122,7 @@ extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
 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 *);
-extern void nfs_page_group_lock(struct nfs_page *);
+extern int nfs_page_group_lock(struct nfs_page *, bool);
 extern void nfs_page_group_unlock(struct nfs_page *);
 extern bool nfs_page_group_sync_on_bit(struct nfs_page *, unsigned int);
 
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9a1396e70310..0040629894df 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -993,6 +993,7 @@ struct nfs4_setclientid {
         unsigned int                    sc_uaddr_len;
         char                            sc_uaddr[RPCBIND_MAXUADDRLEN + 1];
         u32                             sc_cb_ident;
+        struct rpc_cred                 *sc_cred;
 };
 
 struct nfs4_setclientid_res {
@@ -1253,18 +1254,12 @@ enum {
         NFS_IOHDR_ERROR = 0,
         NFS_IOHDR_EOF,
         NFS_IOHDR_REDO,
-        NFS_IOHDR_NEED_COMMIT,
-        NFS_IOHDR_NEED_RESCHED,
 };
 
-struct nfs_pgio_data;
-
 struct nfs_pgio_header {
         struct inode            *inode;
         struct rpc_cred         *cred;
         struct list_head        pages;
-        struct nfs_pgio_data    *data;
-        atomic_t                refcnt;
         struct nfs_page         *req;
         struct nfs_writeverf    verf;           /* Used for writes */
         struct pnfs_layout_segment *lseg;
@@ -1281,28 +1276,22 @@ struct nfs_pgio_header {
         int                     error;          /* merge with pnfs_error */
         unsigned long           good_bytes;     /* boundary of good data */
         unsigned long           flags;
-};
 
-struct nfs_pgio_data {
-        struct nfs_pgio_header  *header;
+        /*
+         * rpc data
+         */
         struct rpc_task         task;
         struct nfs_fattr        fattr;
-        struct nfs_writeverf    verf;           /* Used for writes */
         struct nfs_pgio_args    args;           /* argument struct */
         struct nfs_pgio_res     res;            /* result struct */
         unsigned long           timestamp;      /* For lease renewal */
-        int (*pgio_done_cb) (struct rpc_task *task, struct nfs_pgio_data *data);
+        int (*pgio_done_cb)(struct rpc_task *, struct nfs_pgio_header *);
         __u64                   mds_offset;     /* Filelayout dense stripe */
-        struct nfs_page_array   pages;
+        struct nfs_page_array   page_array;
         struct nfs_client       *ds_clp;        /* pNFS data server */
         int                     ds_idx;         /* ds index if ds_clp is set */
 };
 
-struct nfs_rw_header {
-        struct nfs_pgio_header  header;
-        struct nfs_pgio_data    rpc_data;
-};
-
 struct nfs_mds_commit_info {
         atomic_t rpcs_out;
         unsigned long           ncommit;
@@ -1432,11 +1421,12 @@ struct nfs_rpc_ops {
                              struct nfs_pathconf *);
         int     (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
         int     (*decode_dirent)(struct xdr_stream *, struct nfs_entry *, int);
-        int     (*pgio_rpc_prepare)(struct rpc_task *, struct nfs_pgio_data *);
+        int     (*pgio_rpc_prepare)(struct rpc_task *,