From owner-svn-src-head@freebsd.org  Tue Jun 20 19:45:04 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47B64DA0B10;
 Tue, 20 Jun 2017 19:45:04 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 166CA70EBE;
 Tue, 20 Jun 2017 19:45:04 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5KJj3bU004068;
 Tue, 20 Jun 2017 19:45:03 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5KJj3vx004067;
 Tue, 20 Jun 2017 19:45:03 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201706201945.v5KJj3vx004067@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Tue, 20 Jun 2017 19:45:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320167 - head/cddl/usr.sbin/zfsd
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jun 2017 19:45:04 -0000

Author: asomers
Date: Tue Jun 20 19:45:02 2017
New Revision: 320167
URL: https://svnweb.freebsd.org/changeset/base/320167

Log:
  zfsd(8): Remove pidfile on shutdown
  
  MFC after:	3 weeks
  Sponsored by:	Spectra Logic Corp

Modified:
  head/cddl/usr.sbin/zfsd/zfsd.cc

Modified: head/cddl/usr.sbin/zfsd/zfsd.cc
==============================================================================
--- head/cddl/usr.sbin/zfsd/zfsd.cc	Tue Jun 20 19:34:21 2017	(r320166)
+++ head/cddl/usr.sbin/zfsd/zfsd.cc	Tue Jun 20 19:45:02 2017	(r320167)
@@ -437,7 +437,7 @@ void
 ZfsDaemon::ClosePIDFile()
 {
 	if (s_pidFH != NULL)
-		pidfile_close(s_pidFH);
+		pidfile_remove(s_pidFH);
 }
 
 void