[pnfs] [0/11] ibm-pnfs-d19-v2

[Benny Halevy]

I reorganized your patchset, including my comments into ibm-pnfs-d19-v2.

The draft-19 tree is now organized as follows now:
nfs41-d19
        ibm-pnfs-d19-v2
                pnfs-d19
                        panlayout-d19

Following is git-diff ibm-pnfs-d19-v{1,2},

Benny

git-diff --stat -p ibm-pnfs-d19-v1 ibm-pnfs-d19-v2
 fs/nfsd/nfs4xdr.c               |   20 ++++++++++----------
 include/linux/nfsd/nfsd4_pnfs.h |    9 +++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index fda3208..8121020 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1300,8 +1300,8 @@ nfsd4_decode_layoutget(struct nfsd4_compoundargs *argp,
 	READ64(lgp->lg_seg.offset);
 	READ64(lgp->lg_seg.length);
 	READ64(lgp->lg_minlength);
-	READ32(lgp->lg_generation);
-	COPYMEM(&lgp->lg_opaque, sizeof(stateid_opaque_t));
+	READ32(lgp->lg_sid.si_generation);
+	COPYMEM(&lgp->lg_sid.si_opaque, sizeof(stateid_opaque_t));
 	READ32(lgp->lg_maxcount);
 
 	DECODE_TAIL;
@@ -1335,8 +1335,8 @@ nfsd4_decode_layoutcommit(struct nfsd4_compoundargs *argp,
 	READ64(lcp->lc_seg.offset);
 	READ64(lcp->lc_seg.length);
 	READ32(lcp->lc_reclaim);
-	READ32(lcp->lc_generation);
-	COPYMEM(&lcp->lc_opaque, sizeof(stateid_opaque_t));
+	READ32(lcp->lc_sid.si_generation);
+	COPYMEM(&lcp->lc_sid.si_opaque, sizeof(stateid_opaque_t));
 	READ32(lcp->lc_newoffset);
 	if (lcp->lc_newoffset) {
 		READ_BUF(8);
@@ -1384,8 +1384,8 @@ nfsd4_decode_layoutreturn(struct nfsd4_compoundargs *argp,
 		READ_BUF(20 + sizeof(stateid_opaque_t));
 		READ64(lrp->lr_seg.offset);
 		READ64(lrp->lr_seg.length);
-		READ32(lrp->lr_generation);
-		COPYMEM(&lrp->lr_opaque, sizeof(stateid_opaque_t));
+		READ32(lrp->lr_sid.si_generation);
+		COPYMEM(&lrp->lr_sid.si_opaque, sizeof(stateid_opaque_t));
 	}
 
 	DECODE_TAIL;
@@ -3477,8 +3477,8 @@ nfsd4_encode_layoutget(struct nfsd4_compoundres *resp,
 	/* Rewind to beginning and encode attrs */
 	p = p_start;
 	WRITE32(args.return_on_close);
-	WRITE32(lgp->lg_generation);
-	WRITEMEM(&lgp->lg_opaque, sizeof(stateid_opaque_t));
+	WRITE32(lgp->lg_sid.si_generation);
+	WRITEMEM(&lgp->lg_sid.si_opaque, sizeof(stateid_opaque_t));
 	WRITE64(args.seg.offset);
 	WRITE64(args.seg.length);
 	WRITE32(args.seg.iomode);
@@ -3527,8 +3527,8 @@ nfsd4_encode_layoutreturn(struct nfsd4_compoundres *resp, int nfserr,
 	if (!nfserr) {
 		RESERVE_SPACE(4 + sizeof(stateid_t));
 		WRITE32(1);    /* got stateid */
-		WRITE32(lrp->lr_generation);
-		WRITEMEM(&lrp->lr_opaque, sizeof(stateid_opaque_t));
+		WRITE32(lrp->lr_sid.si_generation);
+		WRITEMEM(&lrp->lr_sid.si_opaque, sizeof(stateid_opaque_t));
 		ADJUST_ARGS();
 	}
 }
diff --git a/include/linux/nfsd/nfsd4_pnfs.h b/include/linux/nfsd/nfsd4_pnfs.h
index d1ed3fc..72b2f25 100644
--- a/include/linux/nfsd/nfsd4_pnfs.h
+++ b/include/linux/nfsd/nfsd4_pnfs.h
@@ -67,8 +67,7 @@ struct nfsd4_pnfs_layoutget {
 	u64			lg_minlength;	/* request */
 	u32			lg_maxcount;	/* request */
 	struct svc_fh		*lg_fhp;	/* response */
-	u32			lg_generation;  /* request/response */
-	stateid_opaque_t	lg_opaque;	/* request/response */
+	stateid_t		lg_sid;		/* request/response */
 };
 
 struct nfsd4_pnfs_layoutcommit {
@@ -77,8 +76,7 @@ struct nfsd4_pnfs_layoutcommit {
 	u32			lc_newoffset;	/* request */
 	u64			lc_last_wr;	/* request */
 	struct nfstime4		lc_mtime;	/* request */
-	u32			lc_generation;	/* request */
-	stateid_opaque_t	lc_opaque;	/* request */
+	stateid_t		lc_sid;		/* request */
 	u32			lc_up_len;	/* layout length */
 	void			*lc_up_layout;	/* decoded by callback */
 	u32			lc_size_chg;	/* boolean for response */
@@ -95,8 +93,7 @@ struct nfsd4_pnfs_layoutreturn {
 	struct nfsd4_layout_seg	lr_seg;		/* request */
 	u32			lr_reclaim;	/* request */
 	u32			lr_flags;
-	u32			lr_generation;
-	stateid_opaque_t	lr_opaque;
+	stateid_t		lr_sid;		/* request/resopnse */
 };
 
 struct nfsd4_pnfs_cb_layout {