nfs: fix timstamp debug prints
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 Oct 2019 09:13:16 +0000 (10:13 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 18 Dec 2019 17:07:32 +0000 (18:07 +0100)
Starting in v5.5, the timestamps are correctly passed down as
64-bit seconds with NFSv4 on 32-bit machines, but some debug
statements still truncate them to 'long'.

Fixes: e86d5a02874c ("NFS: Convert struct nfs_fattr to use struct timespec64")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
fs/nfs/nfs4xdr.c

index 936c57779ff4d08291463042b4b367701d9a2aba..728d88b6a698ae55b19840f7e18ab86e6d4e0a26 100644 (file)
@@ -4097,7 +4097,7 @@ static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, str
                        status = NFS_ATTR_FATTR_ATIME;
                bitmap[1] &= ~FATTR4_WORD1_TIME_ACCESS;
        }
-       dprintk("%s: atime=%ld\n", __func__, (long)time->tv_sec);
+       dprintk("%s: atime=%lld\n", __func__, time->tv_sec);
        return status;
 }
 
@@ -4115,7 +4115,7 @@ static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, s
                        status = NFS_ATTR_FATTR_CTIME;
                bitmap[1] &= ~FATTR4_WORD1_TIME_METADATA;
        }
-       dprintk("%s: ctime=%ld\n", __func__, (long)time->tv_sec);
+       dprintk("%s: ctime=%lld\n", __func__, time->tv_sec);
        return status;
 }
 
@@ -4132,8 +4132,8 @@ static int decode_attr_time_delta(struct xdr_stream *xdr, uint32_t *bitmap,
                status = decode_attr_time(xdr, time);
                bitmap[1] &= ~FATTR4_WORD1_TIME_DELTA;
        }
-       dprintk("%s: time_delta=%ld %ld\n", __func__, (long)time->tv_sec,
-               (long)time->tv_nsec);
+       dprintk("%s: time_delta=%lld %ld\n", __func__, time->tv_sec,
+               time->tv_nsec);
        return status;
 }
 
@@ -4197,7 +4197,7 @@ static int decode_attr_time_modify(struct xdr_stream *xdr, uint32_t *bitmap, str
                        status = NFS_ATTR_FATTR_MTIME;
                bitmap[1] &= ~FATTR4_WORD1_TIME_MODIFY;
        }
-       dprintk("%s: mtime=%ld\n", __func__, (long)time->tv_sec);
+       dprintk("%s: mtime=%lld\n", __func__, time->tv_sec);
        return status;
 }