From owner-svn-src-stable-10@FreeBSD.ORG  Thu Apr 23 15:24:34 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 A85E152B;
 Thu, 23 Apr 2015 15:24:34 +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 95A2B1C78;
 Thu, 23 Apr 2015 15:24:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NFOYwB027053;
 Thu, 23 Apr 2015 15:24:34 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NFOYaW027052;
 Thu, 23 Apr 2015 15:24:34 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201504231524.t3NFOYaW027052@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 23 Apr 2015 15:24:34 +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: r281896 - stable/10/usr.bin/lockf
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Apr 2015 15:24:34 -0000

Author: bdrewery
Date: Thu Apr 23 15:24:33 2015
New Revision: 281896
URL: https://svnweb.freebsd.org/changeset/base/281896

Log:
  MFC r281582:
  
    Remove extra flags from r250462.

Modified:
  stable/10/usr.bin/lockf/lockf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/lockf/lockf.c
==============================================================================
--- stable/10/usr.bin/lockf/lockf.c	Thu Apr 23 15:21:47 2015	(r281895)
+++ stable/10/usr.bin/lockf/lockf.c	Thu Apr 23 15:24:33 2015	(r281896)
@@ -169,7 +169,7 @@ acquire_lock(const char *name, int flags
 {
 	int fd;
 
-	if ((fd = open(name, flags|O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
+	if ((fd = open(name, O_RDONLY|O_EXLOCK|flags, 0666)) == -1) {
 		if (errno == EAGAIN || errno == EINTR)
 			return (-1);
 		err(EX_CANTCREAT, "cannot open %s", name);