1 files changed, 33 insertions, 45 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index fc461926c412..da7a1300dc60 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -112,6 +112,7 @@ struct nfs_fsinfo {
         __u32                   wtmult; /* writes should be multiple of this */
         __u32                   dtpref; /* pref. readdir transfer size */
         __u64                   maxfilesize;
+        struct timespec         time_delta; /* server time granularity */
         __u32                   lease_time; /* in seconds */
 };
 
@@ -170,7 +171,7 @@ struct nfs4_sequence_args {
 
 struct nfs4_sequence_res {
         struct nfs4_session     *sr_session;
-        u8                      sr_slotid;      /* slot used to send request */
+        struct nfs4_slot        *sr_slot;       /* slot used to send request */
         int                     sr_status;      /* sequence operation status */
         unsigned long           sr_renewal_time;
         u32                     sr_status_flags;
@@ -400,6 +401,27 @@ struct nfs_removeres {
 };
 
 /*
+ * Common arguments to the rename call
+ */
+struct nfs_renameargs {
+        const struct nfs_fh             *old_dir;
+        const struct nfs_fh             *new_dir;
+        const struct qstr               *old_name;
+        const struct qstr               *new_name;
+        const u32                       *bitmask;
+        struct nfs4_sequence_args       seq_args;
+};
+
+struct nfs_renameres {
+        const struct nfs_server         *server;
+        struct nfs4_change_info         old_cinfo;
+        struct nfs_fattr                *old_fattr;
+        struct nfs4_change_info         new_cinfo;
+        struct nfs_fattr                *new_fattr;
+        struct nfs4_sequence_res        seq_res;
+};
+
+/*
  * Argument struct for decode_entry function
  */
 struct nfs_entry {
@@ -434,15 +456,6 @@ struct nfs_createargs {
         struct iattr *          sattr;
 };
 
-struct nfs_renameargs {
-        struct nfs_fh *         fromfh;
-        const char *            fromname;
-        unsigned int            fromlen;
-        struct nfs_fh *         tofh;
-        const char *            toname;
-        unsigned int            tolen;
-};
-
 struct nfs_setattrargs {
         struct nfs_fh *                 fh;
         nfs4_stateid                    stateid;
@@ -586,15 +599,6 @@ struct nfs3_mknodargs {
         dev_t                   rdev;
 };
 
-struct nfs3_renameargs {
-        struct nfs_fh *         fromfh;
-        const char *            fromname;
-        unsigned int            fromlen;
-        struct nfs_fh *         tofh;
-        const char *            toname;
-        unsigned int            tolen;
-};
-
 struct nfs3_linkargs {
         struct nfs_fh *         fromfh;
         struct nfs_fh *         tofh;
@@ -629,11 +633,6 @@ struct nfs3_readlinkargs {
         struct page **          pages;
 };
 
-struct nfs3_renameres {
-        struct nfs_fattr *      fromattr;
-        struct nfs_fattr *      toattr;
-};
-
 struct nfs3_linkres {
         struct nfs_fattr *      dir_attr;
         struct nfs_fattr *      fattr;
@@ -780,6 +779,7 @@ struct nfs4_readdir_arg {
         struct page **                  pages;  /* zero-copy data */
         unsigned int                    pgbase; /* zero-copy data */
         const u32 *                     bitmask;
+        int                             plus;
         struct nfs4_sequence_args       seq_args;
 };
 
@@ -801,24 +801,6 @@ struct nfs4_readlink_res {
         struct nfs4_sequence_res        seq_res;
 };
 
-struct nfs4_rename_arg {
-        const struct nfs_fh *           old_dir;
-        const struct nfs_fh *           new_dir;
-        const struct qstr *             old_name;
-        const struct qstr *             new_name;
-        const u32 *                     bitmask;
-        struct nfs4_sequence_args       seq_args;
-};
-
-struct nfs4_rename_res {
-        const struct nfs_server *       server;
-        struct nfs4_change_info         old_cinfo;
-        struct nfs_fattr *              old_fattr;
-        struct nfs4_change_info         new_cinfo;
-        struct nfs_fattr *              new_fattr;
-        struct nfs4_sequence_res        seq_res;
-};
-
 #define NFS4_SETCLIENTID_NAMELEN        (127)
 struct nfs4_setclientid {
         const nfs4_verifier *           sc_verifier;
@@ -1032,19 +1014,21 @@ struct nfs_rpc_ops {
         int     (*readlink)(struct inode *, struct page *, unsigned int,
                             unsigned int);
         int     (*create)  (struct inode *, struct dentry *,
-                            struct iattr *, int, struct nameidata *);
+                            struct iattr *, int, struct nfs_open_context *);
         int     (*remove)  (struct inode *, struct qstr *);
         void    (*unlink_setup)  (struct rpc_message *, struct inode *dir);
         int     (*unlink_done) (struct rpc_task *, struct inode *);
         int     (*rename)  (struct inode *, struct qstr *,
                             struct inode *, struct qstr *);
+        void    (*rename_setup)  (struct rpc_message *msg, struct inode *dir);
+        int     (*rename_done) (struct rpc_task *task, struct inode *old_dir, struct inode *new_dir);
         int     (*link)    (struct inode *, struct inode *, struct qstr *);
         int     (*symlink) (struct inode *, struct dentry *, struct page *,
                             unsigned int, struct iattr *);
         int     (*mkdir)   (struct inode *, struct dentry *, struct iattr *);
         int     (*rmdir)   (struct inode *, struct qstr *);
         int     (*readdir) (struct dentry *, struct rpc_cred *,
-                            u64, struct page *, unsigned int, int);
+                            u64, struct page **, unsigned int, int);
         int     (*mknod)   (struct inode *, struct dentry *, struct iattr *,
                             dev_t);
         int     (*statfs)  (struct nfs_server *, struct nfs_fh *,
@@ -1054,7 +1038,7 @@ struct nfs_rpc_ops {
         int     (*pathconf) (struct nfs_server *, struct nfs_fh *,
                              struct nfs_pathconf *);
         int     (*set_capabilities)(struct nfs_server *, struct nfs_fh *);
-        __be32 *(*decode_dirent)(__be32 *, struct nfs_entry *, int plus);
+        __be32 *(*decode_dirent)(struct xdr_stream *, struct nfs_entry *, struct nfs_server *, int plus);
         void    (*read_setup)   (struct nfs_read_data *, struct rpc_message *);
         int     (*read_done)  (struct rpc_task *, struct nfs_read_data *);
         void    (*write_setup)  (struct nfs_write_data *, struct rpc_message *);
@@ -1065,6 +1049,10 @@ struct nfs_rpc_ops {
         int     (*lock_check_bounds)(const struct file_lock *);
         void    (*clear_acl_cache)(struct inode *);
         void    (*close_context)(struct nfs_open_context *ctx, int);
+        struct inode * (*open_context) (struct inode *dir,
+                                struct nfs_open_context *ctx,
+                                int open_flags,
+                                struct iattr *iattr);
 };
 
 /*