Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2020 14:09:43 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r362055 - head/sys/compat/linux
Message-ID:  <202006111409.05BE9hLR000872@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Thu Jun 11 14:09:43 2020
New Revision: 362055
URL: https://svnweb.freebsd.org/changeset/base/362055

Log:
  Replace LINUX_FASYNC with LINUX_O_ASYNC; no functional changes.
  
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D25218

Modified:
  head/sys/compat/linux/linux_file.c
  head/sys/compat/linux/linux_file.h

Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c	Thu Jun 11 13:34:09 2020	(r362054)
+++ head/sys/compat/linux/linux_file.c	Thu Jun 11 14:09:43 2020	(r362055)
@@ -113,7 +113,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;
@@ -1286,7 +1286,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;
@@ -1305,7 +1305,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: head/sys/compat/linux/linux_file.h
==============================================================================
--- head/sys/compat/linux/linux_file.h	Thu Jun 11 13:34:09 2020	(r362054)
+++ head/sys/compat/linux/linux_file.h	Thu Jun 11 14:09:43 2020	(r362055)
@@ -76,7 +76,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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006111409.05BE9hLR000872>