[pnfs] CVS: nfsv4

[Marc Eshel IBM]

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

Modified files:
	cvs/pnfs/include/linux/nfsd: nfs4layoutxdr.h nfsd4_pnfs.h 

Log message:
Update server for latest client changes.

Index: nfsd/nfs4layoutxdr.h
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/include/linux/nfsd/nfs4layoutxdr.h,v
retrieving revision 1.3
diff -u -r1.3 nfs4layoutxdr.h
--- nfsd/nfs4layoutxdr.h	23 Aug 2006 20:38:34 -0000	1.3
+++ nfsd/nfs4layoutxdr.h	31 Aug 2006 22:25:37 -0000
@@ -58,8 +58,9 @@

/* the nfsd4_pnfs_devlist dev_addr for the file layout type */
struct pnfs_filelayout_devaddr {
-	struct xdr_netobj r_netid;
-	struct xdr_netobj r_addr;
+	u32			r_dev_type;
+	struct xdr_netobj	r_netid;
+	struct xdr_netobj	r_addr;
};

struct nfsd4_pnfs_layoutlist {
Index: nfsd/nfsd4_pnfs.h
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/include/linux/nfsd/nfsd4_pnfs.h,v
retrieving revision 1.5
diff -u -r1.5 nfsd4_pnfs.h
--- nfsd/nfsd4_pnfs.h	23 Aug 2006 20:38:34 -0000	1.5
+++ nfsd/nfsd4_pnfs.h	31 Aug 2006 22:25:37 -0000
@@ -45,7 +45,6 @@
* the gd_ops->layout_encode() callback */
struct nfsd4_pnfs_devlist {
u32		dev_id;
-	u32		dev_type;
void	 	*dev_addr;  /* encoded by callback */
};

@@ -56,7 +55,6 @@
/* nfs4_verifier */
u64			        gd_verf;        /* request - response */
struct export_operations	*gd_ops;
-	u32             		gd_dev_type;    /* response */
u32				gd_devlist_len; /* response */
struct nfsd4_pnfs_devlist 	*gd_devlist;    /*response */
u32				gd_eof;
@@ -67,13 +65,13 @@
u32                             gd_dev_id;    /* request */
u32                             gd_maxcnt;    /* request */
struct export_operations	*gd_ops;
-	u32             		gd_dev_type;    /* response */
u32				gd_devlist_len; /* response */
void				*gd_devaddr;    /*response */
};

struct nfsd4_pnfs_layoutget {
u64				lg_clientid;	/* request */
+	u32				lg_signal;	/* request */
u32				lg_type;	/* request - response */
u32				lg_iomode;	/* request - response*/
u64				lg_offset;	/* request - response */
@@ -98,6 +96,8 @@
u64                     lc_clientid;    /* request */
u64                     lc_offset;      /* request */
u64                     lc_length;      /* request */
+	u32                     lc_reclaim;     /* request */
+	u32                     lc_newoffset;   /* request */
u64                     lc_last_wr;     /* request */
u64                     lc_modify_sec;  /* request */
u32                     lc_modify_nsec; /* request */
@@ -113,6 +113,7 @@
u64				lr_offset;	/* request */
u64				lr_length;	/* request */
u32				lr_iomode;	/* request */
+	u32				lr_file;	/* request */
u32				lr_reclaim;	/* request */
u32				lr_type;	/* request */
};