NFS: remove page size checking code
Subsystems (2)
PATCH 7/10 NFS: remove page size checking code
Remove the page size checking code for a readdir decode. This is now done by decode_dirent with xdr_streams.
Signed-off-by Bryan Schumaker <[email protected]>
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/nfs2xdr.c | 54 ------------------------------------- fs/nfs/nfs3xdr.c | 78 +----------------------------------------------------- fs/nfs/nfs4xdr.c | 68 +---------------------------------------------- 3 files changed, 2 insertions(+), 198 deletions(-)
fs/nfs/nfs2xdr.c +0 -54
@@ -423,9 +423,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy)struct page **page;size_t hdrlen;unsigned int pglen, recvd; -u32 len;int status, nr =0 ; -__be32 *end, *entry, *kaddr;if ((status =ntohl (*p++)))return nfs_stat_to_errno (status);
@@ -445,59 +443,7 @@ nfs_xdr_readdirres(struct rpc_rqst *req, __be32 *p, void *dummy)if (pglen > recvd) pglen = recvd; page = rcvbuf->pages; - kaddr = p =kmap_atomic (*page,KM_USER0 ); - end = (__be32 *)((char *)p + pglen); - entry = p; - -/* Make sure the packet actually has a value_follows and EOF entry */ -if ((entry +1 ) > end) - goto short_pkt; - -for (; *p++; nr++) { -if (p +2 > end) - goto short_pkt; - p++;/* fileid */ - len =ntohl (*p++); - p +=XDR_QUADLEN (len) +1 ;/* name plus cookie */ -if (len >NFS2_MAXNAMLEN ) { -dprintk ("NFS: giant filename in readdir (len 0x%x)!\n" , - len); - goto err_unmap; - } -if (p +2 > end) - goto short_pkt; - entry = p; - } - -/* -* Apparently some server sends responses that are a valid size, but -* contain no entries, and have value_follows==0 and EOF==0. For -* those, just set the EOF marker. -*/ -if (!nr && entry[1 ] ==0 ) { -dprintk ("NFS: readdir reply truncated!\n" ); - entry[1 ] =1 ; - } - out: -kunmap_atomic (kaddr,KM_USER0 );return nr; - short_pkt: -/* -* When we get a short packet there are 2 possibilities. We can -* return an error, or fix up the response to look like a valid -* response and return what we have so far. If there are no -* entries and the packet was short, then return -EIO. If there -* are valid entries in the response, return them and pretend that -* the call was successful, but incomplete. The caller can retry the -* readdir starting at the last cookie. -*/ - entry[0 ] = entry[1 ] =0 ; -if (!nr) - nr = -errno_NFSERR_IO; - goto out; -err_unmap: - nr = -errno_NFSERR_IO; - goto out; }static void print_overflow_msg (const char *func,const struct xdr_stream *xdr)
fs/nfs/nfs3xdr.c +1 -77
93 lines not on this page · raw message
fs/nfs/nfs4xdr.c +1 -67
84 lines not on this page · raw message