[pnfs] [PATCH 4/7] nfs4_pnfs_layout_segment: use for layoutreturn

[Benny Halevy]

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfs/nfs4xdr.c         |    6 +++---
 fs/nfs/pnfs.c            |    6 +++---
 include/linux/pnfs_xdr.h |    4 +---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index dfa0b82..8c28b58 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1705,13 +1705,13 @@ static int encode_pnfs_layoutreturn(struct xdr_stream *xdr, const struct nfs4_pn
         WRITE32(OP_LAYOUTRETURN);
 	WRITE32(args->reclaim);
         WRITE32(args->layout_type);
-        WRITE32(args->iomode);
+	WRITE32(args->lseg.iomode);
         WRITE32(args->return_type);
 	if (args->return_type == RETURN_FILE)
         {
 		RESERVE_SPACE(16);
-                WRITE64(args->offset);
-                WRITE64(args->length);
+		WRITE64(args->lseg.offset);
+		WRITE64(args->lseg.length);
         }
         return 0;
 }
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index d7e91aa..217f3f2 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -370,10 +370,10 @@ pnfs_return_layout(struct inode* ino, int type)
 
 	arg.reclaim = 0;
 	arg.layout_type = server->pnfs_curr_ld->id;
-	arg.iomode = IOMODE_ANY /* for now */;
+	arg.lseg.iomode = IOMODE_ANY /* for now */;
 	arg.return_type = type;
-	arg.offset = 0;
-	arg.length = ~0;
+	arg.lseg.offset = 0;
+	arg.lseg.length = ~0;
 	arg.inode = ino;
 	arg.minorversion_info = &seqarg;
 	res.minorversion_info = &seqres;
diff --git a/include/linux/pnfs_xdr.h b/include/linux/pnfs_xdr.h
index c4f0785..d12faf2 100644
--- a/include/linux/pnfs_xdr.h
+++ b/include/linux/pnfs_xdr.h
@@ -89,10 +89,8 @@ struct pnfs_layoutcommit_data {
 struct nfs4_pnfs_layoutreturn_arg {
 	__u32	reclaim;
 	__u32	layout_type;
-	__u32	iomode;
 	__u32   return_type;
-	__u64	offset;
-	__u64	length;
+	struct nfs4_pnfs_layout_segment lseg;
 	struct inode* inode;
 	void *minorversion_info;
 };
-- 
1.5.2.5