Merge tag 'riscv/for-v5.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...

[linux.git] / include / linux / nfs_xdr.h

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 9b8324ec08f3191f7ff95944ed0d0cb07df67194..72d5695c1b474d0e1e4abed1fd6ad2637d4dfa33 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -62,14 +62,14 @@ struct nfs_fattr {
        struct nfs_fsid         fsid;
        __u64                   fileid;
        __u64                   mounted_on_fileid;
-       struct timespec         atime;
-       struct timespec         mtime;
-       struct timespec         ctime;
+       struct timespec64       atime;
+       struct timespec64       mtime;
+       struct timespec64       ctime;
        __u64                   change_attr;    /* NFSv4 change attribute */
        __u64                   pre_change_attr;/* pre-op NFSv4 change attribute */
        __u64                   pre_size;       /* pre_op_attr.size       */
-       struct timespec         pre_mtime;      /* pre_op_attr.mtime      */
-       struct timespec         pre_ctime;      /* pre_op_attr.ctime      */
+       struct timespec64       pre_mtime;      /* pre_op_attr.mtime      */
+       struct timespec64       pre_ctime;      /* pre_op_attr.ctime      */
        unsigned long           time_start;
        unsigned long           gencount;
        struct nfs4_string      *owner_name;
@@ -143,7 +143,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 */
+       struct timespec64       time_delta; /* server time granularity */
        __u32                   lease_time; /* in seconds */
        __u32                   nlayouttypes; /* number of layouttypes */
        __u32                   layouttype[NFS_MAX_LAYOUT_TYPES]; /* supported pnfs layout driver */
@@ -869,7 +869,7 @@ struct nfs3_sattrargs {
        struct nfs_fh *         fh;
        struct iattr *          sattr;
        unsigned int            guard;
-       struct timespec         guardtime;
+       struct timespec64       guardtime;
 };
 
 struct nfs3_diropargs {
@@ -1435,6 +1435,7 @@ struct nfs42_copy_args {
 
        u64                             count;
        bool                            sync;
+       struct nl4_server               *cp_src;
 };
 
 struct nfs42_write_res {
@@ -1463,6 +1464,22 @@ struct nfs42_offload_status_res {
        int                             osr_status;
 };
 
+struct nfs42_copy_notify_args {
+       struct nfs4_sequence_args       cna_seq_args;
+
+       struct nfs_fh           *cna_src_fh;
+       nfs4_stateid            cna_src_stateid;
+       struct nl4_server       cna_dst;
+};
+
+struct nfs42_copy_notify_res {
+       struct nfs4_sequence_res        cnr_seq_res;
+
+       struct nfstime4         cnr_lease_time;
+       nfs4_stateid            cnr_stateid;
+       struct nl4_server       cnr_src;
+};
+
 struct nfs42_seek_args {
        struct nfs4_sequence_args       seq_args;