[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.	2006/12/08 02:07:43

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

Log message:
call the filesystem's layout_return() only in nfs4_free_layout (reverts 1.18)

Index: fs/nfsd/nfs4state.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4state.c,v
retrieving revision 1.22
diff -u -p -r1.22 nfs4state.c
--- fs/nfsd/nfs4state.c	8 Dec 2006 07:06:01 -0000	1.22
+++ fs/nfsd/nfs4state.c	8 Dec 2006 07:07:07 -0000
@@ -3642,11 +3642,6 @@ int nfs4_pnfs_return_layout(struct super
dprintk("pNFS %s: lp %p\n", __FUNCTION__, lp);

if (lp) {
-		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);
-		}
nfs4_put_layout(lp);
status = 0;
}