From owner-svn-src-stable-12@freebsd.org Mon Aug 24 14:01:53 2020 Return-Path: Delivered-To: svn-src-stable-12@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 80D1D3C104F; Mon, 24 Aug 2020 14:01:53 +0000 (UTC) (envelope-from trasz@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 4BZv1s2qmVz4rVQ; Mon, 24 Aug 2020 14:01:53 +0000 (UTC) (envelope-from trasz@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 451ED1982D; Mon, 24 Aug 2020 14:01:53 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OE1rJb084148; Mon, 24 Aug 2020 14:01:53 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OE1qsp084146; Mon, 24 Aug 2020 14:01:52 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008241401.07OE1qsp084146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 24 Aug 2020 14:01:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364683 - stable/12/sys/compat/linux X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/12/sys/compat/linux X-SVN-Commit-Revision: 364683 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 14:01:53 -0000 Author: trasz Date: Mon Aug 24 14:01:52 2020 New Revision: 364683 URL: https://svnweb.freebsd.org/changeset/base/364683 Log: MFC r362055: Replace LINUX_FASYNC with LINUX_O_ASYNC; no functional changes. Sponsored by: The FreeBSD Foundation Modified: stable/12/sys/compat/linux/linux_file.c stable/12/sys/compat/linux/linux_file.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linux/linux_file.c ============================================================================== --- stable/12/sys/compat/linux/linux_file.c Mon Aug 24 14:00:12 2020 (r364682) +++ stable/12/sys/compat/linux/linux_file.c Mon Aug 24 14:01:52 2020 (r364683) @@ -116,7 +116,7 @@ linux_common_open(struct thread *td, int dirfd, char * bsd_flags |= O_CLOEXEC; if (l_flags & LINUX_O_NONBLOCK) bsd_flags |= O_NONBLOCK; - if (l_flags & LINUX_FASYNC) + if (l_flags & LINUX_O_ASYNC) bsd_flags |= O_ASYNC; if (l_flags & LINUX_O_CREAT) bsd_flags |= O_CREAT; @@ -1406,7 +1406,7 @@ fcntl_common(struct thread *td, struct linux_fcntl_arg if (result & O_FSYNC) td->td_retval[0] |= LINUX_O_SYNC; if (result & O_ASYNC) - td->td_retval[0] |= LINUX_FASYNC; + td->td_retval[0] |= LINUX_O_ASYNC; #ifdef LINUX_O_NOFOLLOW if (result & O_NOFOLLOW) td->td_retval[0] |= LINUX_O_NOFOLLOW; @@ -1425,7 +1425,7 @@ fcntl_common(struct thread *td, struct linux_fcntl_arg arg |= O_APPEND; if (args->arg & LINUX_O_SYNC) arg |= O_FSYNC; - if (args->arg & LINUX_FASYNC) + if (args->arg & LINUX_O_ASYNC) arg |= O_ASYNC; #ifdef LINUX_O_NOFOLLOW if (args->arg & LINUX_O_NOFOLLOW) Modified: stable/12/sys/compat/linux/linux_file.h ============================================================================== --- stable/12/sys/compat/linux/linux_file.h Mon Aug 24 14:00:12 2020 (r364682) +++ stable/12/sys/compat/linux/linux_file.h Mon Aug 24 14:01:52 2020 (r364683) @@ -71,7 +71,7 @@ #define LINUX_O_NONBLOCK 00004000 #define LINUX_O_NDELAY LINUX_O_NONBLOCK #define LINUX_O_SYNC 00010000 -#define LINUX_FASYNC 00020000 +#define LINUX_O_ASYNC 00020000 #define LINUX_O_DIRECT 00040000 /* Direct disk access hint */ #define LINUX_O_LARGEFILE 00100000 #define LINUX_O_DIRECTORY 00200000 /* Must be a directory */