Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

Pull nfsd updates from Bruce Fields:
 "This was a very quiet cycle! Just a few bugfixes and some cleanup"

* 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
  rpc: let xdr layer allocate gssproxy receieve pages
  rpc: fix huge kmalloc's in gss-proxy
  rpc: comment on linux_cred encoding, treat all as unsigned
  rpc: clean up decoding of gssproxy linux creds
  svcrpc: remove unused rq_resused
  nfsd4: nfsd4_create_clid_dir prints uninitialized data
  nfsd4: fix leak of inode reference on delegation failure
  Revert "nfsd: nfs4_file_get_access: need to be more careful with O_RDWR"
  sunrpc: prepare NFS for 2038
  nfsd4: fix setlease error return
  nfsd: nfs4_file_get_access: need to be more careful with O_RDWR

2 files changed, 20 insertions, 3 deletions

diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 6ce690de447f..437ddb6c4aef 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -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;
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 1f0216b9a6c9..6eecfc2e4f98 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -243,7 +243,6 @@ struct svc_rqst {
         struct xdr_buf          rq_res;
         struct page *           rq_pages[RPCSVC_MAXPAGES];
         struct page *           *rq_respages;   /* points into rq_pages */
-        int                     rq_resused;     /* number of pages used for result */
         struct page *           *rq_next_page; /* next reply page to use */
 
         struct kvec             rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */