sunrpc: prepare NFS for 2038 (2f74f972) · Commits · 戴 / test

1) The kernel sunrpc code needs to handle seconds since epoch greater than 2147483647. This means functions that parse time as an int need to handle it as time_t. 2) The kernel changes must be accompanied by userspace changes in nfs-utils. Signed-off-by:

Harshula Jayasuriya <harshula@redhat.com> Signed-off-by:

J. Bruce Fields <bfields@redhat.com>

include/linux/sunrpc/cache.h

+20 −2

Original line number	Diff line number	Diff line
		@@ -264,12 +264,30 @@ static inline int get_uint(char *bpp, unsigned int anint)
		return 0;
		}

		static inline int get_time(char *bpp, time_t time)
		{
		char buf[50];
		long long ll;
		int len = qword_get(bpp, buf, sizeof(buf));

		if (len < 0)
		return -EINVAL;
		if (len == 0)
		return -ENOENT;

		if (kstrtoll(buf, 0, &ll))
		return -EINVAL;

		*time = (time_t)ll;
		return 0;
		}

		static inline time_t get_expiry(char **bpp)
		{
		int rv;
		time_t rv;
		struct timespec boot;

		if (get_int(bpp, &rv))
		if (get_time(bpp, &rv))
		return 0;
		if (rv < 0)
		return 0;

Admin message