From ff009ed6a6161b602d6a122ae5cac29048f25e69 Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Fri, 21 Apr 2000 15:50:20 +0000
Subject: [PATCH] O_FYNC -> O_SYNC

---
 sys/compat/ibcs2/ibcs2_fcntl.c      | 8 ++++----
 sys/compat/linux/linux_file.c       | 6 +++---
 sys/compat/sunos/sunos_ioctl.c      | 4 ++--
 sys/compat/sunos/sunos_misc.c       | 4 ++--
 sys/compat/svr4/svr4_fcntl.c        | 6 +++---
 sys/compat/ultrix/ultrix_pathname.c | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/sys/compat/ibcs2/ibcs2_fcntl.c b/sys/compat/ibcs2/ibcs2_fcntl.c
index 670320e6ab7..3352d62a7fe 100644
--- a/sys/compat/ibcs2/ibcs2_fcntl.c
+++ b/sys/compat/ibcs2/ibcs2_fcntl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_fcntl.c,v 1.5 1997/12/20 16:32:10 deraadt Exp $	*/
+/*	$OpenBSD: ibcs2_fcntl.c,v 1.6 2000/04/21 15:50:22 millert Exp $	*/
 /*	$NetBSD: ibcs2_fcntl.c,v 1.6 1996/05/03 17:05:20 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ cvt_o_flags(flags)
 	if (flags & IBCS2_O_RDWR) r |= O_RDWR;
 	if (flags & (IBCS2_O_NDELAY | IBCS2_O_NONBLOCK)) r |= O_NONBLOCK;
 	if (flags & IBCS2_O_APPEND) r |= O_APPEND;
-	if (flags & IBCS2_O_SYNC) r |= O_FSYNC;
+	if (flags & IBCS2_O_SYNC) r |= O_SYNC;
 	if (flags & IBCS2_O_CREAT) r |= O_CREAT;
 	if (flags & IBCS2_O_TRUNC) r |= O_TRUNC;
 	if (flags & IBCS2_O_EXCL) r |= O_EXCL;
@@ -131,7 +131,7 @@ ioflags2oflags(flags)
 	if (flags & IBCS2_O_RDWR) r |= O_RDWR;
 	if (flags & IBCS2_O_NDELAY) r |= O_NONBLOCK;
 	if (flags & IBCS2_O_APPEND) r |= O_APPEND;
-	if (flags & IBCS2_O_SYNC) r |= O_FSYNC;
+	if (flags & IBCS2_O_SYNC) r |= O_SYNC;
 	if (flags & IBCS2_O_NONBLOCK) r |= O_NONBLOCK;
 	if (flags & IBCS2_O_CREAT) r |= O_CREAT;
 	if (flags & IBCS2_O_TRUNC) r |= O_TRUNC;
@@ -152,7 +152,7 @@ oflags2ioflags(flags)
 	if (flags & O_RDWR) r |= IBCS2_O_RDWR;
 	if (flags & O_NDELAY) r |= IBCS2_O_NONBLOCK;
 	if (flags & O_APPEND) r |= IBCS2_O_APPEND;
-	if (flags & O_FSYNC) r |= IBCS2_O_SYNC;
+	if (flags & O_SYNC) r |= IBCS2_O_SYNC;
 	if (flags & O_NONBLOCK) r |= IBCS2_O_NONBLOCK;
 	if (flags & O_CREAT) r |= IBCS2_O_CREAT;
 	if (flags & O_TRUNC) r |= IBCS2_O_TRUNC;
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index a25d65763ed..b974f20e77d 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_file.c,v 1.12 2000/04/19 08:34:56 csapuntz Exp $	*/
+/*	$OpenBSD: linux_file.c,v 1.13 2000/04/21 15:50:20 millert Exp $	*/
 /*	$NetBSD: linux_file.c,v 1.15 1996/05/20 01:59:09 fvdl Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ linux_to_bsd_ioflags(lflags)
 	res |= cvtto_bsd_mask(lflags, LINUX_O_NOCTTY, O_NOCTTY);
 	res |= cvtto_bsd_mask(lflags, LINUX_O_TRUNC, O_TRUNC);
 	res |= cvtto_bsd_mask(lflags, LINUX_O_NDELAY, O_NDELAY);
-	res |= cvtto_bsd_mask(lflags, LINUX_O_SYNC, O_FSYNC);
+	res |= cvtto_bsd_mask(lflags, LINUX_O_SYNC, O_SYNC);
 	res |= cvtto_bsd_mask(lflags, LINUX_FASYNC, O_ASYNC);
 	res |= cvtto_bsd_mask(lflags, LINUX_O_APPEND, O_APPEND);
 
@@ -112,7 +112,7 @@ bsd_to_linux_ioflags(bflags)
 	res |= cvtto_linux_mask(bflags, O_NOCTTY, LINUX_O_NOCTTY);
 	res |= cvtto_linux_mask(bflags, O_TRUNC, LINUX_O_TRUNC);
 	res |= cvtto_linux_mask(bflags, O_NDELAY, LINUX_O_NDELAY);
-	res |= cvtto_linux_mask(bflags, O_FSYNC, LINUX_O_SYNC);
+	res |= cvtto_linux_mask(bflags, O_SYNC, LINUX_O_SYNC);
 	res |= cvtto_linux_mask(bflags, O_ASYNC, LINUX_FASYNC);
 	res |= cvtto_linux_mask(bflags, O_APPEND, LINUX_O_APPEND);
 
diff --git a/sys/compat/sunos/sunos_ioctl.c b/sys/compat/sunos/sunos_ioctl.c
index 40f9110cbf0..f942d93e4ed 100644
--- a/sys/compat/sunos/sunos_ioctl.c
+++ b/sys/compat/sunos/sunos_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_ioctl.c,v 1.9 1998/04/26 22:54:19 niklas Exp $	*/
+/*	$OpenBSD: sunos_ioctl.c,v 1.10 2000/04/21 15:50:21 millert Exp $	*/
 /*	$NetBSD: sunos_ioctl.c,v 1.23 1996/03/14 19:33:46 christos Exp $	*/
 
 /*
@@ -920,7 +920,7 @@ static struct {
 	{ SUN_FNBIO, O_NONBLOCK },
 	{ SUN_SHLOCK, O_SHLOCK },
 	{ SUN_EXLOCK, O_EXLOCK },
-	{ SUN_FSYNC, O_FSYNC },
+	{ SUN_FSYNC, O_SYNC },
 	{ SUN_FSETBLK, 0 },
 	{ SUN_FNOCTTY, 0 }
 };
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c
index 55c328313c5..77a5438ec25 100644
--- a/sys/compat/sunos/sunos_misc.c
+++ b/sys/compat/sunos/sunos_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sunos_misc.c,v 1.22 2000/01/22 23:06:34 millert Exp $	*/
+/*	$OpenBSD: sunos_misc.c,v 1.23 2000/04/21 15:50:21 millert Exp $	*/
 /*	$NetBSD: sunos_misc.c,v 1.65 1996/04/22 01:44:31 christos Exp $	*/
 
 /*
@@ -744,7 +744,7 @@ sunos_sys_open(p, v, retval)
 	r |=	((l & (0x0004 | 0x1000 | 0x4000)) ? O_NONBLOCK : 0);
 	r |=	((l & 0x0080) ? O_SHLOCK : 0);
 	r |=	((l & 0x0100) ? O_EXLOCK : 0);
-	r |=	((l & 0x2000) ? O_FSYNC : 0);
+	r |=	((l & 0x2000) ? O_SYNC : 0);
 
 	SCARG(uap, flags) = r;
 	ret = sys_open(p, (struct sys_open_args *)uap, retval);
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index 248fd36f384..0257f231fd1 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_fcntl.c,v 1.14 1999/10/07 16:14:28 brad Exp $	 */
+/*	$OpenBSD: svr4_fcntl.c,v 1.15 2000/04/21 15:50:21 millert Exp $	 */
 /*	$NetBSD: svr4_fcntl.c,v 1.14 1995/10/14 20:24:24 christos Exp $	 */
 
 /*
@@ -95,7 +95,7 @@ svr4_to_bsd_flags(l)
 	r |= (l & SVR4_O_RDWR) ? O_RDWR : 0;
 	r |= (l & SVR4_O_NDELAY) ? O_NONBLOCK : 0;
 	r |= (l & SVR4_O_APPEND) ? O_APPEND : 0;
-	r |= (l & SVR4_O_SYNC) ? O_FSYNC : 0;
+	r |= (l & SVR4_O_SYNC) ? O_SYNC : 0;
 #if 0
 	/* Dellism ??? */
 	r |= (l & SVR4_O_RAIOSIG) ? O_ASYNC : 0;
@@ -120,7 +120,7 @@ bsd_to_svr4_flags(l)
 	r |= (l & O_RDWR) ? SVR4_O_RDWR : 0;
 	r |= (l & O_NDELAY) ? SVR4_O_NONBLOCK : 0;
 	r |= (l & O_APPEND) ? SVR4_O_APPEND : 0;
-	r |= (l & O_FSYNC) ? SVR4_O_SYNC : 0;
+	r |= (l & O_SYNC) ? SVR4_O_SYNC : 0;
 #if 0
 	/* Dellism ??? */
 	r |= (l & O_ASYNC) ? SVR4_O_RAIOSIG : 0;
diff --git a/sys/compat/ultrix/ultrix_pathname.c b/sys/compat/ultrix/ultrix_pathname.c
index 24166358677..80ea178d427 100644
--- a/sys/compat/ultrix/ultrix_pathname.c
+++ b/sys/compat/ultrix/ultrix_pathname.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultrix_pathname.c,v 1.3 1996/08/02 20:35:52 niklas Exp $	*/
+/*	$OpenBSD: ultrix_pathname.c,v 1.4 2000/04/21 15:50:21 millert Exp $	*/
 /*	$NetBSD: ultrix_pathname.c,v 1.2 1996/04/07 17:23:07 jonathan Exp $	*/
 
 /*
@@ -178,7 +178,7 @@ ultrix_sys_open(p, v, retval)
 	r |=	((l & (0x0004 | 0x1000 | 0x4000)) ? O_NONBLOCK : 0);
 	r |=	((l & 0x0080) ? O_SHLOCK : 0);
 	r |=	((l & 0x0100) ? O_EXLOCK : 0);
-	r |=	((l & 0x2000) ? O_FSYNC : 0);
+	r |=	((l & 0x2000) ? O_SYNC : 0);
 
 	SCARG(uap, flags) = r;
 	ret = sys_open(p, (struct sys_open_args *)uap, retval);
-- 
2.20.1