From owner-svn-src-projects@FreeBSD.ORG  Thu Apr 26 00:18:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA6A01065670;
	Thu, 26 Apr 2012 00:18:38 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5B158FC12;
	Thu, 26 Apr 2012 00:18:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3Q0IcmE021431;
	Thu, 26 Apr 2012 00:18:38 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3Q0Icu3021429;
	Thu, 26 Apr 2012 00:18:38 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201204260018.q3Q0Icu3021429@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 26 Apr 2012 00:18:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234689 - projects/nfsv4.1-client/sys/fs/nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2012 00:18:38 -0000

Author: rmacklem
Date: Thu Apr 26 00:18:38 2012
New Revision: 234689
URL: http://svn.freebsd.org/changeset/base/234689

Log:
  Add support to the NFSv4.1 PNFS client for returning stale
  layouts.

Modified:
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Wed Apr 25 22:44:07 2012	(r234688)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Thu Apr 26 00:18:38 2012	(r234689)
@@ -2441,6 +2441,7 @@ nfscl_renewthread(struct nfsclclient *cl
 	struct nfsclflayout *flp;
 	struct nfscldevinfo *dip, *ndip;
 	struct nfscllayouthead rlh;
+	struct nfsclrecalllayout *recallp;
 
 	cred = newnfs_getcred();
 	NFSLOCKCLSTATE();
@@ -2635,7 +2636,6 @@ printf("do layoutcommit\n");
 				TAILQ_INSERT_HEAD(&rlh, lyp, nfsly_list);
 			}
 		}
-#ifdef notyet
 		/* Now, look for stale layouts. */
 		lyp = TAILQ_LAST(&clp->nfsc_layout, nfscllayouthead);
 		while (lyp != NULL) {
@@ -2644,10 +2644,16 @@ printf("do layoutcommit\n");
 			    (lyp->nfsly_flags & NFSLY_RECALL) == 0 &&
 			    lyp->nfsly_refcnt == 0) {
 printf("ret stale lay=%d\n", nfscl_layoutcnt);
+				recallp = malloc(sizeof(*recallp),
+				    M_NFSLAYRECALL, M_NOWAIT);
+				if (recallp == NULL)
+					break;
+				(void)nfscl_layoutrecall(NFSLAYOUTRETURN_FILE,
+				    lyp, NFSLAYOUTIOMODE_ANY, 0, UINT64_MAX,
+				    lyp->nfsly_stateid.seqid, recallp);
 			}
 			lyp = nlyp;
 		}
-#endif
 
 		/*
 		 * Free up any unreferenced device info structures.