svn commit: r364683 - stable/12/sys/compat/linux

[Edward Tomasz Napierala]

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 */