From owner-svn-src-head@FreeBSD.ORG  Mon Oct 20 17:53:49 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB1086C0;
 Mon, 20 Oct 2014 17:53:49 +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 C7EB6D5;
 Mon, 20 Oct 2014 17:53:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9KHrn5J009501;
 Mon, 20 Oct 2014 17:53:49 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9KHrnaG009500;
 Mon, 20 Oct 2014 17:53:49 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201410201753.s9KHrnaG009500@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 20 Oct 2014 17:53:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273335 - head/sys/fs/unionfs
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.18-1
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: Mon, 20 Oct 2014 17:53:50 -0000

Author: mjg
Date: Mon Oct 20 17:53:49 2014
New Revision: 273335
URL: https://svnweb.freebsd.org/changeset/base/273335

Log:
  unionfs: hold mount interlock while manipulating mnt_flag
  
  This is for consistency with other filesystems.

Modified:
  head/sys/fs/unionfs/union_vfsops.c

Modified: head/sys/fs/unionfs/union_vfsops.c
==============================================================================
--- head/sys/fs/unionfs/union_vfsops.c	Mon Oct 20 17:04:03 2014	(r273334)
+++ head/sys/fs/unionfs/union_vfsops.c	Mon Oct 20 17:53:49 2014	(r273335)
@@ -290,12 +290,14 @@ unionfs_domount(struct mount *mp)
 		return (error);
 	}
 
+	MNT_ILOCK(mp);
 	/*
 	 * Check mnt_flag
 	 */
 	if ((ump->um_lowervp->v_mount->mnt_flag & MNT_LOCAL) &&
 	    (ump->um_uppervp->v_mount->mnt_flag & MNT_LOCAL))
 		mp->mnt_flag |= MNT_LOCAL;
+	MNT_IUNLOCK(mp);
 
 	/*
 	 * Get new fsid