From owner-svn-src-stable@FreeBSD.ORG  Tue May 31 17:24:18 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 988511065676;
	Tue, 31 May 2011 17:24:18 +0000 (UTC)
	(envelope-from will@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87F7E8FC17;
	Tue, 31 May 2011 17:24:18 +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 p4VHOIki033080;
	Tue, 31 May 2011 17:24:18 GMT (envelope-from will@svn.freebsd.org)
Received: (from will@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4VHOIFT033078;
	Tue, 31 May 2011 17:24:18 GMT (envelope-from will@svn.freebsd.org)
Message-Id: <201105311724.p4VHOIFT033078@svn.freebsd.org>
From: Will Andrews <will@FreeBSD.org>
Date: Tue, 31 May 2011 17:24:18 +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: r222536 - stable/8/cddl/compat/opensolaris/misc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 May 2011 17:24:18 -0000

Author: will
Date: Tue May 31 17:24:18 2011
New Revision: 222536
URL: http://svn.freebsd.org/changeset/base/222536

Log:
  MFC r222313: Close a race between libzfs and mountd when updating NFS exports.
  
  Reviewed by:	pjd
  Approved by:	ken

Modified:
  stable/8/cddl/compat/opensolaris/misc/fsshare.c
Directory Properties:
  stable/8/cddl/compat/opensolaris/   (props changed)

Modified: stable/8/cddl/compat/opensolaris/misc/fsshare.c
==============================================================================
--- stable/8/cddl/compat/opensolaris/misc/fsshare.c	Tue May 31 17:14:06 2011	(r222535)
+++ stable/8/cddl/compat/opensolaris/misc/fsshare.c	Tue May 31 17:24:18 2011	(r222536)
@@ -221,6 +221,7 @@ out:
 			error = errno;
 			unlink(tmpfile);
 		} else {
+			fflush(newfd);
 			/*
 			 * Send SIGHUP to mountd, but unlock exports file later.
 			 */