diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2010-09-21 16:55:48 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-21 16:55:48 -0400 |
commit | b4687da7fc5f741af7fee9b0248a2cf2ad9c4478 (patch) | |
tree | 1df8cb2cc72a88b4646bf380ff68345415d0222f /fs/nfs/nfs2xdr.c | |
parent | 38359352fcb0d776b562a9e0ed4f0d355d5a332e (diff) |
SUNRPC: Refactor logic to NUL-terminate strings in pages
Clean up: Introduce a helper to '\0'-terminate XDR strings
that are placed in a page in the page cache.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs2xdr.c')
-rw-r--r-- | fs/nfs/nfs2xdr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index e15bc0306d0c..79c74387a2fe 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c | |||
@@ -596,7 +596,6 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy) | |||
596 | struct kvec *iov = rcvbuf->head; | 596 | struct kvec *iov = rcvbuf->head; |
597 | size_t hdrlen; | 597 | size_t hdrlen; |
598 | u32 len, recvd; | 598 | u32 len, recvd; |
599 | char *kaddr; | ||
600 | int status; | 599 | int status; |
601 | 600 | ||
602 | if ((status = ntohl(*p++))) | 601 | if ((status = ntohl(*p++))) |
@@ -623,10 +622,7 @@ nfs_xdr_readlinkres(struct rpc_rqst *req, __be32 *p, void *dummy) | |||
623 | return -EIO; | 622 | return -EIO; |
624 | } | 623 | } |
625 | 624 | ||
626 | /* NULL terminate the string we got */ | 625 | xdr_terminate_string(rcvbuf, len); |
627 | kaddr = (char *)kmap_atomic(rcvbuf->pages[0], KM_USER0); | ||
628 | kaddr[len+rcvbuf->page_base] = '\0'; | ||
629 | kunmap_atomic(kaddr, KM_USER0); | ||
630 | return 0; | 626 | return 0; |
631 | } | 627 | } |
632 | 628 | ||