[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT}
From: |
Will Cohen |
Subject: |
[PATCH 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} |
Date: |
Wed, 13 Oct 2021 19:03:59 -0400 |
From: Keno Fischer <keno@juliacomputing.com>
Darwin doesn't have either of these flags. Darwin does have
F_NOCACHE, which is similar to O_DIRECT, but has different
enough semantics that other projects don't generally map
them automatically. In any case, we don't support O_DIRECT
on Linux at the moment either.
Signed-off-by: Keno Fischer <keno@juliacomputing.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
Signed-off-by: Will Cohen <wwcohen@gmail.com>
---
hw/9pfs/9p-util.h | 2 ++
hw/9pfs/9p.c | 13 ++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
index 546f46dc7d..627baebaba 100644
--- a/hw/9pfs/9p-util.h
+++ b/hw/9pfs/9p-util.h
@@ -41,6 +41,7 @@ again:
fd = openat(dirfd, name, flags | O_NOFOLLOW | O_NOCTTY | O_NONBLOCK,
mode);
if (fd == -1) {
+#ifndef CONFIG_DARWIN
if (errno == EPERM && (flags & O_NOATIME)) {
/*
* The client passed O_NOATIME but we lack permissions to honor it.
@@ -53,6 +54,7 @@ again:
flags &= ~O_NOATIME;
goto again;
}
+#endif
return -1;
}
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 2464ffeb94..97dc8b246f 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -131,11 +131,20 @@ static int dotl_to_open_flags(int flags)
{ P9_DOTL_NONBLOCK, O_NONBLOCK } ,
{ P9_DOTL_DSYNC, O_DSYNC },
{ P9_DOTL_FASYNC, FASYNC },
+#ifndef CONFIG_DARWIN
+ { P9_DOTL_NOATIME, O_NOATIME },
+ /*
+ * On Darwin, we could map to F_NOCACHE, which is
+ * similar, but doesn't quite have the same
+ * semantics. However, we don't support O_DIRECT
+ * even on linux at the moment, so we just ignore
+ * it here.
+ */
{ P9_DOTL_DIRECT, O_DIRECT },
+#endif
{ P9_DOTL_LARGEFILE, O_LARGEFILE },
{ P9_DOTL_DIRECTORY, O_DIRECTORY },
{ P9_DOTL_NOFOLLOW, O_NOFOLLOW },
- { P9_DOTL_NOATIME, O_NOATIME },
{ P9_DOTL_SYNC, O_SYNC },
};
@@ -164,10 +173,12 @@ static int get_dotl_openflags(V9fsState *s, int oflags)
*/
flags = dotl_to_open_flags(oflags);
flags &= ~(O_NOCTTY | O_ASYNC | O_CREAT);
+#ifndef CONFIG_DARWIN
/*
* Ignore direct disk access hint until the server supports it.
*/
flags &= ~O_DIRECT;
+#endif
return flags;
}
--
2.33.0
- [PATCH 03/11] 9p: darwin: Handle struct stat(fs) differences, (continued)
- [PATCH 03/11] 9p: darwin: Handle struct stat(fs) differences, Will Cohen, 2021/10/13
- [PATCH 04/11] 9p: darwin: Handle struct dirent differences, Will Cohen, 2021/10/13
- [PATCH 09/11] 9p: darwin: Provide a fallback implementation for utimensat, Will Cohen, 2021/10/13
- [PATCH 10/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2021/10/13
- [PATCH 07/11] 9p: darwin: *xattr_nofollow implementations, Will Cohen, 2021/10/13
- [PATCH 11/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2021/10/13
- [PATCH 01/11] 9p: linux: Fix a couple Linux assumptions, Will Cohen, 2021/10/13
- [PATCH 06/11] 9p: darwin: Compatibility defn for XATTR_SIZE_MAX, Will Cohen, 2021/10/13
- [PATCH 08/11] 9p: darwin: Compatibility for f/l*xattr, Will Cohen, 2021/10/13
- [PATCH 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT},
Will Cohen <=
- Re: [PATCH 00/11] 9p: Add support for Darwin, Greg Kurz, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Will Cohen, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Christian Schoenebeck, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Will Cohen, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Christian Schoenebeck, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Will Cohen, 2021/10/14
- Re: [PATCH 00/11] 9p: Add support for Darwin, Christian Schoenebeck, 2021/10/20