[pnfs] CVS: nfsv4

[Marc Eshel IBM]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	eshel at citi.	2006/09/19 19:23:33

Modified files:
	cvs/pnfs/include/linux: fs.h 
	cvs/pnfs/include/linux/nfsd: xdr4.h 

Log message:
Do not pass struct nfsd4_compoundres to exported encode routines.

Index: fs.h
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/include/linux/fs.h,v
retrieving revision 1.11
diff -u -r1.11 fs.h
--- fs.h	13 Jul 2006 17:18:46 -0000	1.11
+++ fs.h	19 Sep 2006 22:20:45 -0000
@@ -1264,7 +1264,7 @@
/* pNFS: Returns the supported pnfs_layouttype4. */
int (*layout_type)(void);
/* pNFS: encodes opaque device list */
-	void (*devaddr_encode)(void *resp, void * devaddr);
+	int (*devaddr_encode)(u32 *p, u32 *end, void * devaddr);
/* pNFS: free's opaque device list */
void (*devaddr_free)(void * devaddr);
/* pNFS: returns the opaque device list */
@@ -1274,7 +1274,7 @@
layout - file system defined
* Ret: new value of xdr buffer pointer
*/
-	void (*layout_encode)(unsigned int **resp, void *layout);
+	int (*layout_encode)(u32 *p, u32 *end, void *layout);
/* pNFS: free's opaque layout
* Arg: layout - file system defined
*/
Index: nfsd/xdr4.h
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/include/linux/nfsd/xdr4.h,v
retrieving revision 1.9
diff -u -r1.9 xdr4.h
--- nfsd/xdr4.h	20 Apr 2006 16:21:17 -0000	1.9
+++ nfsd/xdr4.h	19 Sep 2006 22:20:46 -0000
@@ -469,9 +469,9 @@
struct svc_fh *current_fh, struct nfsd4_delegreturn *dr);
extern void nfsd4_devlist_free( struct nfsd4_pnfs_getdevlist *gdlp);

-void filelayout_encode_devaddr(struct nfsd4_compoundres *resp, void *dev_addr);
+int filelayout_encode_devaddr(u32 *p, u32 *end, void *dev_addr);
void filelayout_free_devaddr(void *devaddr);
-void filelayout_encode_layout(struct nfsd4_compoundres *resp, void *layout);
+int filelayout_encode_layout(u32 *p, u32 *end, void *layout);
void filelayout_free_layout(void *layout);

#endif