[pnfs] CVS: nfsv4

[Marc Eshel IBM]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	eshel at citi.	2006/08/31 18:46:08

Modified files:
	cvs/pnfs/fs/nfsd: nfs4filelayoutxdr.c nfs4xdr.c 

Log message:
Update server for latest client changes.

Index: nfs4filelayoutxdr.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4filelayoutxdr.c,v
retrieving revision 1.14
diff -u -r1.14 nfs4filelayoutxdr.c
--- nfs4filelayoutxdr.c	23 Aug 2006 20:39:47 -0000	1.14
+++ nfs4filelayoutxdr.c	31 Aug 2006 22:25:27 -0000
@@ -52,10 +52,12 @@
ENCODE_HEAD;

fdev = (struct pnfs_filelayout_devaddr *)dev_addr;
-        len = 2+XDR_QUADLEN(fdev->r_netid.len)+XDR_QUADLEN(fdev->r_addr.len);
+        len = 4+XDR_QUADLEN(fdev->r_netid.len)+XDR_QUADLEN(fdev->r_addr.len);
len = len << 2;
RESERVE_SPACE(len);
WRITE32(len);
+	WRITE32(fdev->r_dev_type);
+	WRITE32(1);
WRITE32(fdev->r_netid.len);
WRITEMEM(fdev->r_netid.data,fdev->r_netid.len);
WRITE32(fdev->r_addr.len);
Index: nfs4xdr.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4xdr.c,v
retrieving revision 1.24
diff -u -r1.24 nfs4xdr.c
--- nfs4xdr.c	23 Aug 2006 20:39:47 -0000	1.24
+++ nfs4xdr.c	31 Aug 2006 22:25:27 -0000
@@ -1029,8 +1029,9 @@
{
DECODE_HEAD;

-	READ_BUF(44);
+	READ_BUF(48);
READ64(lgp->lg_clientid);
+	READ32(lgp->lg_signal);
READ32(lgp->lg_type);
READ32(lgp->lg_iomode);
READ64(lgp->lg_offset);
@@ -1065,10 +1066,12 @@
DECODE_HEAD;
u32 timechange, dummy32;

-	READ_BUF(36);
+	READ_BUF(44);
READ64(lcp->lc_clientid);
READ64(lcp->lc_offset);
READ64(lcp->lc_length);
+	READ32(lcp->lc_reclaim);
+	READ32(lcp->lc_newoffset);
READ64(lcp->lc_last_wr);
READ32(timechange);
if (timechange) {
@@ -1108,11 +1111,12 @@
{
DECODE_HEAD;

-	READ_BUF(36);
+	READ_BUF(40);
READ64(lrp->lr_clientid);
READ32(lrp->lr_reclaim);
READ32(lrp->lr_type);
READ32(lrp->lr_iomode);
+	READ32(lrp->lr_file);
if (lrp->lr_type == LAYOUT_NFSV4_FILES)
{
READ64(lrp->lr_offset);
@@ -2675,9 +2679,8 @@
{
ENCODE_HEAD;

-	RESERVE_SPACE(8);
+	RESERVE_SPACE(4);
WRITE32(dlist->dev_id);
-	WRITE32(dlist->dev_type);
ADJUST_ARGS();
if (ex_ops->devaddr_encode == NULL && lotype == LAYOUT_NFSV4_FILES)
{
@@ -2742,14 +2745,6 @@

printk("%s: err %d\n",__FUNCTION__, nfserr);
if (!nfserr) {
-		RESERVE_SPACE(12);
-		WRITE32(gdev->gd_dev_id);
-		WRITE32(gdev->gd_dev_type);
-		WRITE32(gdev->gd_devlist_len);
-		if (gdev->gd_devlist_len > 1) { //??? if>1 must build list
-			printk("nfsd4_encode_getdevinfo: XXX add loop list");
-		}
-		ADJUST_ARGS();
if (gdev->gd_ops->devaddr_encode == NULL &&
gdev->gd_type == LAYOUT_NFSV4_FILES)
{