From owner-svn-src-projects@freebsd.org  Sun Jan  8 18:17:36 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 3EEEDCA5125
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun,  8 Jan 2017 18:17:36 +0000 (UTC) (envelope-from dim@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 11514160F;
 Sun,  8 Jan 2017 18:17:36 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v08IHZFf010733;
 Sun, 8 Jan 2017 18:17:35 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v08IHZ3n010732;
 Sun, 8 Jan 2017 18:17:35 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201701081817.v08IHZ3n010732@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 8 Jan 2017 18:17:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r311692 - projects/clang400-import/sys/geom/vinum
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jan 2017 18:17:36 -0000

Author: dim
Date: Sun Jan  8 18:17:35 2017
New Revision: 311692
URL: https://svnweb.freebsd.org/changeset/base/311692

Log:
  Merge ^/head r311684 through r311691.

Modified:
  projects/clang400-import/sys/geom/vinum/geom_vinum_state.c
Directory Properties:
  projects/clang400-import/   (props changed)

Modified: projects/clang400-import/sys/geom/vinum/geom_vinum_state.c
==============================================================================
--- projects/clang400-import/sys/geom/vinum/geom_vinum_state.c	Sun Jan  8 18:14:28 2017	(r311691)
+++ projects/clang400-import/sys/geom/vinum/geom_vinum_state.c	Sun Jan  8 18:17:35 2017	(r311692)
@@ -183,7 +183,7 @@ gv_set_sd_state(struct gv_sd *s, int new
 		 * Only do this if we're forced, since it usually is done
 		 * internally, and then we do use the force flag. 
 		 */
-		if (!flags & GV_SETSTATE_FORCE)
+		if (!(flags & GV_SETSTATE_FORCE))
 			return (GV_ERR_SETSTATE);
 		break;