[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT}
From: |
Will Cohen |
Subject: |
[PATCH v4 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT} |
Date: |
Sun, 6 Feb 2022 15:07:13 -0500 |
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>
[Michael Roitzsch: - Rebase for NixOS]
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
[Will Cohen: - Adjust coding style]
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 accbec9987..3b9c485414 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 cf694da354..f3b00d20a2 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -138,11 +138,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 },
};
@@ -171,10 +180,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.32.0 (Apple Git-132)
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, (continued)
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Greg Kurz, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Philippe Mathieu-Daudé, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Greg Kurz, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Dr. David Alan Gilbert, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Christian Schoenebeck, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Christian Schoenebeck, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Will Cohen, 2022/02/07
- Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat, Vivek Goyal, 2022/02/07
[PATCH v4 05/11] 9p: darwin: Ignore O_{NOATIME, DIRECT},
Will Cohen <=
[PATCH v4 07/11] 9p: darwin: *xattr_nofollow implementations, Will Cohen, 2022/02/06
[PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2022/02/06
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Philippe Mathieu-Daudé, 2022/02/06
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2022/02/06
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Christian Schoenebeck, 2022/02/07
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Will Cohen, 2022/02/07
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Greg Kurz, 2022/02/07
- Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Christian Schoenebeck, 2022/02/07
Re: [PATCH v4 10/11] 9p: darwin: meson: Allow VirtFS on Darwin, Christian Schoenebeck, 2022/02/07