From owner-svn-src-all@FreeBSD.ORG  Sun Jun 30 13:17:37 2013
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:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8CDCEBAE;
 Sun, 30 Jun 2013 13:17:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7E5671E66;
 Sun, 30 Jun 2013 13:17:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5UDHbv9094480;
 Sun, 30 Jun 2013 13:17:37 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5UDHbje094479;
 Sun, 30 Jun 2013 13:17:37 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201306301317.r5UDHbje094479@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Sun, 30 Jun 2013 13:17:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252415 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 30 Jun 2013 13:17:37 -0000

Author: mjg
Date: Sun Jun 30 13:17:37 2013
New Revision: 252415
URL: http://svnweb.freebsd.org/changeset/base/252415

Log:
  acct: reduce code duplication by using acct_disable as cleanup for
  failed kproc_create
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_acct.c

Modified: head/sys/kern/kern_acct.c
==============================================================================
--- head/sys/kern/kern_acct.c	Sun Jun 30 13:14:46 2013	(r252414)
+++ head/sys/kern/kern_acct.c	Sun Jun 30 13:17:37 2013	(r252415)
@@ -284,12 +284,7 @@ sys_acct(struct thread *td, struct acct_
 		error = kproc_create(acct_thread, NULL, NULL, 0, 0,
 		    "accounting");
 		if (error) {
-			(void) vn_close(acct_vp, acct_flags, acct_cred, td);
-			crfree(acct_cred);
-			acct_configured = 0;
-			acct_vp = NULL;
-			acct_cred = NULL;
-			acct_flags = 0;
+			(void) acct_disable(td, 0);
 			sx_xunlock(&acct_sx);
 			log(LOG_NOTICE, "Unable to start accounting thread\n");
 			return (error);