Merge branch 'linus' into core/futexes

1 files changed, 6 insertions, 5 deletions

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 8c77c11224d1..c1c31acb8a2b 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -36,6 +36,7 @@ struct nfs_fattr {
         __u32                   nlink;
         __u32                   uid;
         __u32                   gid;
+        dev_t                   rdev;
         __u64                   size;
         union {
                 struct {
@@ -46,7 +47,6 @@ struct nfs_fattr {
                         __u64   used;
                 } nfs3;
         } du;
-        dev_t                   rdev;
         struct nfs_fsid         fsid;
         __u64                   fileid;
         struct timespec         atime;
@@ -56,6 +56,7 @@ struct nfs_fattr {
         __u64                   change_attr;    /* NFSv4 change attribute */
         __u64                   pre_change_attr;/* pre-op NFSv4 change attribute */
         unsigned long           time_start;
+        unsigned long           gencount;
 };
 
 #define NFS_ATTR_WCC            0x0001          /* pre-op WCC data    */
@@ -672,16 +673,16 @@ struct nfs4_rename_res {
         struct nfs_fattr *              new_fattr;
 };
 
-#define NFS4_SETCLIENTID_NAMELEN        (56)
+#define NFS4_SETCLIENTID_NAMELEN        (127)
 struct nfs4_setclientid {
         const nfs4_verifier *           sc_verifier;
         unsigned int                    sc_name_len;
-        char                            sc_name[NFS4_SETCLIENTID_NAMELEN];
+        char                            sc_name[NFS4_SETCLIENTID_NAMELEN + 1];
         u32                             sc_prog;
         unsigned int                    sc_netid_len;
-        char                            sc_netid[RPCBIND_MAXNETIDLEN];
+        char                            sc_netid[RPCBIND_MAXNETIDLEN + 1];
         unsigned int                    sc_uaddr_len;
-        char                            sc_uaddr[RPCBIND_MAXUADDRLEN];
+        char                            sc_uaddr[RPCBIND_MAXUADDRLEN + 1];
         u32                             sc_cb_ident;
 };