projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
[linux-2.6-microblaze.git]
/
fs
/
nfsd
/
nfs3xdr.c
diff --git
a/fs/nfsd/nfs3xdr.c
b/fs/nfsd/nfs3xdr.c
index
7c45ba4
..
0293b8d
100644
(file)
--- a/
fs/nfsd/nfs3xdr.c
+++ b/
fs/nfsd/nfs3xdr.c
@@
-254,7
+254,7
@@
svcxdr_decode_sattr3(struct svc_rqst *rqstp, struct xdr_stream *xdr,
if (xdr_stream_decode_u64(xdr, &newsize) < 0)
return false;
iap->ia_valid |= ATTR_SIZE;
if (xdr_stream_decode_u64(xdr, &newsize) < 0)
return false;
iap->ia_valid |= ATTR_SIZE;
- iap->ia_size =
min_t(u64, newsize, NFS_OFFSET_MAX)
;
+ iap->ia_size =
newsize
;
}
if (xdr_stream_decode_u32(xdr, &set_it) < 0)
return false;
}
if (xdr_stream_decode_u32(xdr, &set_it) < 0)
return false;
@@
-1060,7
+1060,7
@@
svcxdr_encode_entry3_common(struct nfsd3_readdirres *resp, const char *name,
return false;
/* cookie */
resp->cookie_offset = dirlist->len;
return false;
/* cookie */
resp->cookie_offset = dirlist->len;
- if (xdr_stream_encode_u64(xdr,
NFS_
OFFSET_MAX) < 0)
+ if (xdr_stream_encode_u64(xdr, OFFSET_MAX) < 0)
return false;
return true;
return false;
return true;