nfsd: pass a 64-bit guardtime to nfsd_setattr()

Guardtime handling in nfs3 differs between 32-bit and 64-bit
architectures, and uses the deprecated time_t type.

Change it to using time64_t, which behaves the same way on
64-bit and 32-bit architectures, treating the number as an
unsigned 32-bit entity with a range of year 1970 to 2106
consistently, and avoiding the y2038 overflow.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 30c75b961d68d848e67fe7a76a1fbc9758da383f..f39cac6e08db405034a831f2a89530c07d8404b2 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -984,7 +984,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        if (status)
                goto out;
        status = nfsd_setattr(rqstp, &cstate->current_fh, &setattr->sa_iattr,
-                               0, (time_t)0);
+                               0, (time64_t)0);
 out:
        fh_drop_write(&cstate->current_fh);
        return status;

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index a178374bacd5d521984b96024782737f036dcc9a..36bbb18abf7755b8dac7f40d3d066f609cfdd564 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -4721,7 +4721,7 @@ nfsd4_truncate(struct svc_rqst *rqstp, struct svc_fh *fh,
                return 0;
        if (!(open->op_share_access & NFS4_SHARE_ACCESS_WRITE))
                return nfserr_inval;
-       return nfsd_setattr(rqstp, fh, &iattr, 0, (time_t)0);
+       return nfsd_setattr(rqstp, fh, &iattr, 0, (time64_t)0);
 }
 
 static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,

diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index c83ddac22f38fe024029c308b078f6ca9f73e5b2..aa013b736073cedcc914b72fcd403d325cd8a67b 100644 (file)
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -113,7 +113,7 @@ nfsd_proc_setattr(struct svc_rqst *rqstp)
                }
        }
 
-       nfserr = nfsd_setattr(rqstp, fhp, iap, 0, (time_t)0);
+       nfserr = nfsd_setattr(rqstp, fhp, iap, 0, (time64_t)0);
 done:
        return nfsd_return_attrs(nfserr, resp);
 }
@@ -380,7 +380,7 @@ nfsd_proc_create(struct svc_rqst *rqstp)
                 */
                attr->ia_valid &= ATTR_SIZE;
                if (attr->ia_valid)
-                       nfserr = nfsd_setattr(rqstp, newfhp, attr, 0, (time_t)0);
+                       nfserr = nfsd_setattr(rqstp, newfhp, attr, 0, (time64_t)0);
        }
 
 out_unlock:

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 82cf80dde5c710532c87ab907d96567abac2e1d4..fe8c5d0e8c5f88d1fbe84d7ba7d6cd5b4e2efeab 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -364,7 +364,7 @@ out_nfserrno:
  */
 __be32
 nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
-            int check_guard, time_t guardtime)
+            int check_guard, time64_t guardtime)
 {
        struct dentry   *dentry;
        struct inode    *inode;
@@ -1133,7 +1133,7 @@ nfsd_create_setattr(struct svc_rqst *rqstp, struct svc_fh *resfhp,
        if (!uid_eq(current_fsuid(), GLOBAL_ROOT_UID))
                iap->ia_valid &= ~(ATTR_UID|ATTR_GID);
        if (iap->ia_valid)
-               return nfsd_setattr(rqstp, resfhp, iap, 0, (time_t)0);
+               return nfsd_setattr(rqstp, resfhp, iap, 0, (time64_t)0);
        /* Callers expect file metadata to be committed here */
        return nfserrno(commit_metadata(resfhp));
 }

diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index cc110a10bfe8b577e3ecb9393d27ff6e899b805a..bbb485177b25f15972cf4efbf3f5c1fbc3e310b3 100644 (file)
--- a/fs/nfsd/vfs.h
+++ b/fs/nfsd/vfs.h
@@ -48,7 +48,7 @@ __be32                 nfsd_lookup_dentry(struct svc_rqst *, struct svc_fh *,
                                const char *, unsigned int,
                                struct svc_export **, struct dentry **);
 __be32         nfsd_setattr(struct svc_rqst *, struct svc_fh *,
-                               struct iattr *, int, time_t);
+                               struct iattr *, int, time64_t);
 int nfsd_mountpoint(struct dentry *, struct svc_export *);
 #ifdef CONFIG_NFSD_V4
 __be32          nfsd4_set_nfs4_label(struct svc_rqst *, struct svc_fh *,

diff --git a/fs/nfsd/xdr3.h b/fs/nfsd/xdr3.h
index 99ff9f403ff18365b501f8c18fb43c2b538eae59..0fa12988fb6a4f1fa9e7c7efba68a1652148486e 100644 (file)
--- a/fs/nfsd/xdr3.h
+++ b/fs/nfsd/xdr3.h
@@ -14,7 +14,7 @@ struct nfsd3_sattrargs {
        struct svc_fh           fh;
        struct iattr            attrs;
        int                     check_guard;
-       time_t                  guardtime;
+       time64_t                guardtime;
 };
 
 struct nfsd3_diropargs {