Merge tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 29adb12c7ecffad9b58d6144d742489cb974de80..4b993d358dad5d3a02939f61f96d799c523fa8a5 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -48,8 +48,8 @@ struct nfs_fattr {
        unsigned int            valid;          /* which fields are valid */
        umode_t                 mode;
        __u32                   nlink;
-       __u32                   uid;
-       __u32                   gid;
+       kuid_t                  uid;
+       kgid_t                  gid;
        dev_t                   rdev;
        __u64                   size;
        union {
@@ -233,6 +233,7 @@ struct nfs4_layoutget_args {
        struct inode *inode;
        struct nfs_open_context *ctx;
        nfs4_stateid stateid;
+       unsigned long timestamp;
        struct nfs4_layoutdriver_data layout;
 };