From owner-dev-commits-src-main@freebsd.org Fri Jan 8 05:02:56 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 92E134E6407; Fri, 8 Jan 2021 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBrZm3lxbz4tNl; Fri, 8 Jan 2021 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 73FD61D9E4; Fri, 8 Jan 2021 05:02:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10852uAI010374; Fri, 8 Jan 2021 05:02:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10852ubl010373; Fri, 8 Jan 2021 05:02:56 GMT (envelope-from git) Date: Fri, 8 Jan 2021 05:02:56 GMT Message-Id: <202101080502.10852ubl010373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Thomas Munro Subject: git: da3ef8e66aa1 - main - Fix conflicting value of O_DSYNC. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tmunro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da3ef8e66aa13db9a79841127a3cbf067de41b69 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 05:02:56 -0000 The branch main has been updated by tmunro: URL: https://cgit.FreeBSD.org/src/commit/?id=da3ef8e66aa13db9a79841127a3cbf067de41b69 commit da3ef8e66aa13db9a79841127a3cbf067de41b69 Author: Thomas Munro AuthorDate: 2021-01-08 05:01:15 +0000 Commit: Thomas Munro CommitDate: 2021-01-08 05:01:15 +0000 Fix conflicting value of O_DSYNC. O_RESOLVE_BENEATH recently took value 0x00800000, but I failed to spot that while rebasing. Let's use 0x01000000 for the new O_DSYNC flag. Reported by: kevans --- sys/sys/fcntl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h index e2597726c53b..3c29c04e46db 100644 --- a/sys/sys/fcntl.h +++ b/sys/sys/fcntl.h @@ -141,7 +141,7 @@ typedef __pid_t pid_t; return back */ #endif -#define O_DSYNC 0x00800000 /* POSIX data sync */ +#define O_DSYNC 0x01000000 /* POSIX data sync */ /* * XXX missing O_RSYNC.