From owner-svn-src-all@FreeBSD.ORG  Thu May 14 18:15:22 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C39EB303;
 Thu, 14 May 2015 18:15:22 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B11A31F03;
 Thu, 14 May 2015 18:15:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4EIFMTJ068508;
 Thu, 14 May 2015 18:15:22 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4EIFMYi068507;
 Thu, 14 May 2015 18:15:22 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201505141815.t4EIFMYi068507@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 14 May 2015 18:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282915 - stable/10/usr.sbin/mountd
X-SVN-Group: stable-10
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.20
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: Thu, 14 May 2015 18:15:22 -0000

Author: sjg
Date: Thu May 14 18:15:21 2015
New Revision: 282915
URL: https://svnweb.freebsd.org/changeset/base/282915

Log:
  No need to delete export from filesystems which are not exported.

Modified:
  stable/10/usr.sbin/mountd/mountd.c

Modified: stable/10/usr.sbin/mountd/mountd.c
==============================================================================
--- stable/10/usr.sbin/mountd/mountd.c	Thu May 14 18:09:56 2015	(r282914)
+++ stable/10/usr.sbin/mountd/mountd.c	Thu May 14 18:15:21 2015	(r282915)
@@ -1732,6 +1732,12 @@ get_exportlist(void)
 		}
 
 		/*
+		 * We do not need to delete "export" flag from
+		 * filesystems that do not have it set.
+		 */
+		if (!(fsp->f_flags & MNT_EXPORTED))
+		    continue;
+		/*
 		 * Do not delete export for network filesystem by
 		 * passing "export" arg to nmount().
 		 * It only makes sense to do this for local filesystems.