Commit e4598e38 authored Oct 31, 2019 by Arnd Bergmann Committed by J. Bruce Fields Dec 19, 2019

nfsd: use timespec64 in encode_time_delta



The values in encode_time_delta are always small and don't
overflow the range of 'struct timespec', so changing it has
no effect.

Change it to timespec64 as a prerequisite for removing the
timespec definition later.

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

parent 92c5e469

fs/nfsd/nfs4xdr.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2099,11 +2099,11 @@ static __be32 encode_change(__be32 p, struct kstat stat, struct inode inode,
		*/
		static __be32 encode_time_delta(__be32 p, struct inode *inode)
		{
		struct timespec ts;
		struct timespec64 ts;
		u32 ns;

		ns = max_t(u32, NSEC_PER_SEC/HZ, inode->i_sb->s_time_gran);
		ts = ns_to_timespec(ns);
		ts = ns_to_timespec64(ns);

		p = xdr_encode_hyper(p, ts.tv_sec);
		*p++ = cpu_to_be32(ts.tv_nsec);

Admin message