diff options
| author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 09:39:16 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-24 09:39:16 +0000 |
| commit | 0afa1b62e33250d4777c5803a98ae69fbe872061 (patch) | |
| tree | 1c747bc01b62bca85d277e2c8321ae6cf0006ed8 /fs/nfs/nfs4xdr.c | |
| parent | 97387e3baaf3c35ad560f8878e943c720a77da1b (diff) | |
| parent | bb4c7e9a9908548b458f34afb2fee74dc0d49f90 (diff) | |
| download | linux-0afa1b62e33250d4777c5803a98ae69fbe872061.tar.gz linux-0afa1b62e33250d4777c5803a98ae69fbe872061.tar.bz2 linux-0afa1b62e33250d4777c5803a98ae69fbe872061.zip | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 95e92e438407..33bd8d0f745d 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -2522,7 +2522,6 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr, xdr_inline_pages(&req->rq_rcv_buf, replen << 2, args->acl_pages, args->acl_pgbase, args->acl_len); - xdr_set_scratch_buffer(xdr, page_address(args->acl_scratch), PAGE_SIZE); encode_nops(&hdr); } @@ -6032,6 +6031,10 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr, struct compound_hdr hdr; int status; + if (res->acl_scratch != NULL) { + void *p = page_address(res->acl_scratch); + xdr_set_scratch_buffer(xdr, p, PAGE_SIZE); + } status = decode_compound_hdr(xdr, &hdr); if (status) goto out; |