Commit ae08483c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Anna Schumaker
Browse files

nfs: use timespec64 in nfs_fattr 



Push down the use of timespec64 into NFS nfs_fattr, to avoid needless
conversions, and get closer to having 64-bit time_t support on 32-bit
NFSv4 and removing some old interfaces from the kernel.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 52879b46

fs/nfs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -697,9 +697,9 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len) 
}



/*

 * Convert a struct timespec into a 64-bit change attribute

 * Convert a struct timespec64 into a 64-bit change attribute

 *

 * This does approximately the same thing as timespec_to_ns(),

 * This does approximately the same thing as timespec64_to_ns(),

 * but for calculation efficiency, we multiply the seconds by

 * 1024*1024*1024.

 */

fs/nfs/nfs4xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE