[pnfs] CVS: nfsv4

[Marc Eshel IBM]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	eshel at citi.	2006/12/06 18:18:02

Modified files:
	cvs/pnfs/fs/nfsd: nfs4state.c 

Log message:
Remove unused struct layout_return and use struct nfsd4_pnfs_layoutreturn.

===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4state.c,v
retrieving revision 1.20
diff -u -r1.20 nfs4state.c
--- nfs4state.c	5 Dec 2006 11:42:50 -0000	1.20
+++ nfs4state.c	6 Dec 2006 23:16:14 -0000
@@ -3400,7 +3400,7 @@
{
struct nfs4_layout *lp;
struct nfs4_file *fp;
-	struct layout_return lr;
+	struct nfsd4_pnfs_layoutreturn lr;
struct inode *ino;

lp = container_of(kref, struct nfs4_layout, lo_ref);
@@ -3410,12 +3410,12 @@
ino = fp->fi_inode;

dprintk("pNFS %s: lp %p fp %p ino %p\n", __FUNCTION__, lp, fp, ino);
-	lr.reclaim = 0;
-	lr.offset = lp->lo_offset;
-	lr.length = lp->lo_length;
-	lr.iomode = lp->lo_iomode;
-	lr.layout_type = lp->lo_layout_type;
-	lr.flags = 0; /* last return */
+	lr.lr_reclaim = 0;
+	lr.lr_offset = lp->lo_offset;
+	lr.lr_length = lp->lo_length;
+	lr.lr_iomode = lp->lo_iomode;
+	lr.lr_type = lp->lo_layout_type;
+	lr.lr_flags = 0; /* last return */

//??? recall layout

@@ -3535,7 +3535,7 @@
struct nfs4_file *fp;
struct nfs4_client *clp = NULL;
struct nfs4_layout *lp = NULL;
-	struct layout_return lr;
+	struct nfsd4_pnfs_layoutreturn lr;

dprintk("NFSD: nfs4_pnfs_get_layout\n");

@@ -3600,12 +3600,12 @@
else
lgp->lg_ops->layout_free(lgp->lg_layout);

-		lr.reclaim = 0;
-		lr.offset = lgp->lg_offset;
-		lr.length = lgp->lg_length;
-		lr.iomode = lgp->lg_iomode;
-		lr.layout_type = lgp->lg_type;
-		lr.flags = lgp->lg_flags;
+		lr.lr_reclaim = 0;
+		lr.lr_offset = lgp->lg_offset;
+		lr.lr_length = lgp->lg_length;
+		lr.lr_iomode = lgp->lg_iomode;
+		lr.lr_type = lgp->lg_type;
+		lr.lr_flags = lgp->lg_flags;
if (sb->s_export_op->layout_return)
sb->s_export_op->layout_return(ino, &lr);
}
@@ -3624,7 +3624,6 @@
struct inode *ino = current_fh->fh_dentry->d_inode;
struct nfs4_file *fp;
struct nfs4_layout *lp = NULL;
-	struct layout_return lr;

dprintk("NFSD: nfs4_pnfs_return_layout\n");

@@ -3643,12 +3642,7 @@
dprintk("pNFS %s: lp %p\n", __FUNCTION__, lp);

if (lp) {
-		lr.reclaim = 0;
-		lr.offset = lrp->lr_offset;
-		lr.length = lrp->lr_length;
-		lr.iomode = lrp->lr_iomode;
-		lr.layout_type = lrp->lr_type;
-		lr.flags = 1; /* update return */
+		lrp->lr_flags = 1; /* update return */
if (sb->s_export_op->layout_return) {
status = sb->s_export_op->layout_return(current_fh->fh_dentry->d_inode,
lrp);