diff options
author | Benny Halevy <bhalevy@panasas.com> | 2011-05-19 14:16:47 -0400 |
---|---|---|
committer | Boaz Harrosh <bharrosh@panasas.com> | 2011-05-29 13:52:32 -0400 |
commit | f7da7a129d57bfe0f74573dc03531c63e1360fae (patch) | |
tree | 6efcd0fbdde9bb816ebc70731f1c47b8335ccfe3 /fs/nfs/nfs4filelayout.c | |
parent | 35c8bb543c9e83197e6375142d1d1c2ee3cf017d (diff) |
SUNRPC: introduce xdr_init_decode_pages
Initialize xdr_stream and xdr_buf using an array of page pointers
and length of buffer.
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Diffstat (limited to 'fs/nfs/nfs4filelayout.c')
-rw-r--r-- | fs/nfs/nfs4filelayout.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c index 501a9b86b318..33bda24e8cd2 100644 --- a/fs/nfs/nfs4filelayout.c +++ b/fs/nfs/nfs4filelayout.c | |||
@@ -510,12 +510,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, | |||
510 | gfp_t gfp_flags) | 510 | gfp_t gfp_flags) |
511 | { | 511 | { |
512 | struct xdr_stream stream; | 512 | struct xdr_stream stream; |
513 | struct xdr_buf buf = { | 513 | struct xdr_buf buf; |
514 | .pages = lgr->layoutp->pages, | ||
515 | .page_len = lgr->layoutp->len, | ||
516 | .buflen = lgr->layoutp->len, | ||
517 | .len = lgr->layoutp->len, | ||
518 | }; | ||
519 | struct page *scratch; | 514 | struct page *scratch; |
520 | __be32 *p; | 515 | __be32 *p; |
521 | uint32_t nfl_util; | 516 | uint32_t nfl_util; |
@@ -527,7 +522,7 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, | |||
527 | if (!scratch) | 522 | if (!scratch) |
528 | return -ENOMEM; | 523 | return -ENOMEM; |
529 | 524 | ||
530 | xdr_init_decode(&stream, &buf, NULL); | 525 | xdr_init_decode_pages(&stream, &buf, lgr->layoutp->pages, lgr->layoutp->len); |
531 | xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE); | 526 | xdr_set_scratch_buffer(&stream, page_address(scratch), PAGE_SIZE); |
532 | 527 | ||
533 | /* 20 = ufl_util (4), first_stripe_index (4), pattern_offset (8), | 528 | /* 20 = ufl_util (4), first_stripe_index (4), pattern_offset (8), |