From owner-svn-src-head@FreeBSD.ORG  Sat Aug 31 15:40:16 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 06BDF28E;
 Sat, 31 Aug 2013 15:40:16 +0000 (UTC)
 (envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E7A3A27F1;
 Sat, 31 Aug 2013 15:40:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7VFeFJC055286;
 Sat, 31 Aug 2013 15:40:15 GMT
 (envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7VFeF2S055285;
 Sat, 31 Aug 2013 15:40:15 GMT
 (envelope-from mckusick@svn.freebsd.org)
Message-Id: <201308311540.r7VFeF2S055285@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Sat, 31 Aug 2013 15:40:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255097 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Aug 2013 15:40:16 -0000

Author: mckusick
Date: Sat Aug 31 15:40:15 2013
New Revision: 255097
URL: http://svnweb.freebsd.org/changeset/base/255097

Log:
  Fix bug introduced in rewrite of keg_free_slab in -r251894.
  The consequence of the bug is that fini calls are not done
  when a slab is freed by a call-back from the page daemon.
  It went unnoticed for two months because fini is little used.
  
  I spotted the bug while reading the code to learn how it works
  so I could write it up for the next edition of the Design and
  Implementation of FreeBSD book.
  
  No MFC needed as this code exists only in HEAD.
  
  Reviewed by: kib, jeff
  Tested by:   pho

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Sat Aug 31 14:56:09 2013	(r255096)
+++ head/sys/vm/uma_core.c	Sat Aug 31 15:40:15 2013	(r255097)
@@ -780,7 +780,7 @@ finished:
 
 	while ((slab = SLIST_FIRST(&freeslabs)) != NULL) {
 		SLIST_REMOVE(&freeslabs, slab, uma_slab, us_hlink);
-		keg_free_slab(keg, slab, 0);
+		keg_free_slab(keg, slab, keg->uk_ipers);
 	}
 }