From owner-svn-src-all@FreeBSD.ORG  Tue Feb 15 20:46:52 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56D66106566B;
	Tue, 15 Feb 2011 20:46:52 +0000 (UTC)
	(envelope-from zack@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 451B68FC12;
	Tue, 15 Feb 2011 20:46:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1FKkqiN043813;
	Tue, 15 Feb 2011 20:46:52 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1FKkqAR043810;
	Tue, 15 Feb 2011 20:46:52 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201102152046.p1FKkqAR043810@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Tue, 15 Feb 2011 20:46:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218714 - stable/8/sys/fs/nfsserver
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Feb 2011 20:46:52 -0000

Author: zack
Date: Tue Feb 15 20:46:51 2011
New Revision: 218714
URL: http://svn.freebsd.org/changeset/base/218714

Log:
  MFC: 217335
  Clean up the experimental NFS server replay cache when the module is unloaded.

Modified:
  stable/8/sys/fs/nfsserver/nfs_nfsdcache.c
  stable/8/sys/fs/nfsserver/nfs_nfsdport.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdcache.c	Tue Feb 15 20:18:52 2011	(r218713)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdcache.c	Tue Feb 15 20:46:51 2011	(r218714)
@@ -727,9 +727,8 @@ nfsrc_freecache(struct nfsrvcache *rp)
 	newnfsstats.srvcache_size--;
 }
 
-#ifdef notdef
 /*
- * Clean out the cache. Called when the last nfsd terminates.
+ * Clean out the cache. Called when nfsserver module is unloaded.
  */
 APPLESTATIC void
 nfsrvd_cleancache(void)
@@ -752,7 +751,6 @@ nfsrvd_cleancache(void)
 	nfsrc_tcpsavedreplies = 0;
 	NFSUNLOCKCACHE();
 }
-#endif	/* notdef */
 
 /*
  * The basic rule is to get rid of entries that are expired.

Modified: stable/8/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Tue Feb 15 20:18:52 2011	(r218713)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Tue Feb 15 20:46:51 2011	(r218714)
@@ -3117,6 +3117,10 @@ nfsd_modevent(module_t mod, int type, vo
 #endif
 		nfsd_call_servertimer = NULL;
 		nfsd_call_nfsd = NULL;
+
+		/* Clean the NFS server reply cache */
+		nfsrvd_cleancache();
+
 		/* and get rid of the locks */
 		mtx_destroy(&nfs_cache_mutex);
 		mtx_destroy(&nfs_v4root_mutex);