[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.	2006/12/04 13:10:59

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

Log message:
call into the filesystem layout_return export function
fixes revision 1.21

Index: fs/nfsd/nfs4proc.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4proc.c,v
retrieving revision 1.21
diff -d -u -r1.21 nfs4proc.c
--- fs/nfsd/nfs4proc.c	28 Nov 2006 18:38:32 -0000	1.21
+++ fs/nfsd/nfs4proc.c	4 Dec 2006 17:31:37 -0000
@@ -907,15 +907,6 @@
goto out;
}

-	/* Layout return export not supported,
-	 * nothing to do so return success.
-	 */
-	if (!sb->s_export_op->layout_return) {
-		dprintk("pNFS %s: Layout return op not supported, return success.\n",__FUNCTION__);
-		status = nfs_ok;
-		goto out;
-	}
-
status = nfs4_pnfs_return_layout(sb, current_fh, lrp);
out:
dprintk("pNFS %s: status %d type %d\n",
Index: fs/nfsd/nfs4state.c
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/fs/nfsd/nfs4state.c,v
retrieving revision 1.17
diff -d -u -r1.17 nfs4state.c
--- fs/nfsd/nfs4state.c	2 Dec 2006 00:35:04 -0000	1.17
+++ fs/nfsd/nfs4state.c	4 Dec 2006 17:31:40 -0000
@@ -3637,6 +3637,10 @@
dprintk("pNFS %s: lp %p\n", __FUNCTION__, lp);

if (lp) {
+		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;
}