[pnfs] [PATCH 1/1] [SQUASHME] panlayout: use refactored pnfs_call_data

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/panlayout/panlayout.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/nfs/panlayout/panlayout.c b/fs/nfs/panlayout/panlayout.c
index 68223e0..c6ca55c 100644
--- a/fs/nfs/panlayout/panlayout.c
+++ b/fs/nfs/panlayout/panlayout.c
@@ -241,7 +241,7 @@ panlayout_read_pagelist(struct pnfs_layout_type *pnfs_layout_type,
 			struct nfs_read_data *rdata)
 {
 	struct inode *inode = PNFS_INODE(pnfs_layout_type);
-	struct pnfs_layout_segment *lseg = rdata->lseg;
+	struct pnfs_layout_segment *lseg = rdata->pdata.lseg;
 	struct panlayout_io_state *state = NULL;
 	ssize_t status = 0;
 	loff_t eof;
@@ -282,7 +282,7 @@ panlayout_read_pagelist(struct pnfs_layout_type *pnfs_layout_type,
 					  nr_pages, offset, count, 0);
  out:
 	dprintk("%s: Return status %Zd\n", __func__, status);
-	rdata->pnfs_error = status;
+	rdata->pdata.pnfs_error = status;
 	return 0;
 }
 
@@ -295,7 +295,7 @@ panlayout_write_done(struct panlayout_io_state *state)
 	wdata = state->rpcdata;
 	wdata->task.tk_status = state->status;
 	if (state->status >= 0) {
-		struct panlayout *panlay = PNFS_LD_DATA(wdata->lseg->layout);
+		struct panlayout *panlay = PNFS_LD_DATA(wdata->pdata.lseg->layout);
 
 		wdata->res.count = state->status;
 		wdata->verf.committed = state->committed;
@@ -335,7 +335,7 @@ panlayout_write_pagelist(struct pnfs_layout_type *pnfs_layout_type,
 	dprintk("%s: Begin inode %p offset %llu count %d\n",
 		__func__, inode, offset, (int)count);
 
-	lseg = wdata->lseg;
+	lseg = wdata->pdata.lseg;
 	BUG_ON(offset < lseg->range.offset);
 	lseg_end_offset = end_offset(lseg->range.offset, lseg->range.length);
 	BUG_ON(offset + count > lseg_end_offset);
@@ -354,7 +354,7 @@ panlayout_write_pagelist(struct pnfs_layout_type *pnfs_layout_type,
 					   stable);
  out:
 	dprintk("%s: Return status %Zd\n", __func__, status);
-	wdata->pnfs_error = status;
+	wdata->pdata.pnfs_error = status;
 	return 0;
 }
 
-- 
1.5.3.3