[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 05/19] 9p: darwin: Ignore O_{NOATIME, DIRECT}
From: |
Christian Schoenebeck |
Subject: |
[PULL v2 05/19] 9p: darwin: Ignore O_{NOATIME, DIRECT} |
Date: |
Mon, 07 Mar 2022 12:15:00 +0100 |
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>
Message-Id: <20220227223522.91937-6-wwcohen@gmail.com>
[C.S.: - Fix compiler warning "unused label 'again'". ]
Link: https://lore.kernel.org/qemu-devel/11201492.CjeqJxXfGd@silver/
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/9p-util.h | 4 ++++
hw/9pfs/9p.c | 13 ++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
index 7449733c15..a48da32f04 100644
--- a/hw/9pfs/9p-util.h
+++ b/hw/9pfs/9p-util.h
@@ -37,10 +37,13 @@ static inline int openat_file(int dirfd, const char *name,
int flags,
{
int fd, serrno, ret;
+#ifndef CONFIG_DARWIN
again:
+#endif
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 +56,7 @@ again:
flags &= ~O_NOATIME;
goto again;
}
+#endif
return -1;
}
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index caf3b240fe..14e84c3bcf 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.20.1
- [PULL v2 00/19] 9p queue 2022-03-07 (previous 2022-03-04), Christian Schoenebeck, 2022/03/07
- [PULL v2 03/19] 9p: darwin: Handle struct stat(fs) differences, Christian Schoenebeck, 2022/03/07
- [PULL v2 04/19] 9p: darwin: Handle struct dirent differences, Christian Schoenebeck, 2022/03/07
- [PULL v2 05/19] 9p: darwin: Ignore O_{NOATIME, DIRECT},
Christian Schoenebeck <=
- [PULL v2 06/19] 9p: darwin: Move XATTR_SIZE_MAX->P9_XATTR_SIZE_MAX, Christian Schoenebeck, 2022/03/07
- [PULL v2 19/19] fsdev/p9array.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 02/19] 9p: Rename 9p-util -> 9p-util-linux, Christian Schoenebeck, 2022/03/07
- [PULL v2 08/19] 9p: darwin: Compatibility for f/l*xattr, Christian Schoenebeck, 2022/03/07
- [PULL v2 07/19] 9p: darwin: *xattr_nofollow implementations, Christian Schoenebeck, 2022/03/07
- [PULL v2 01/19] 9p: linux: Fix a couple Linux assumptions, Christian Schoenebeck, 2022/03/07
- [PULL v2 16/19] 9pfs/9p.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 13/19] 9pfs: drop Doxygen format from qemu_dirent_dup() API comment, Christian Schoenebeck, 2022/03/07
- [PULL v2 15/19] 9pfs/codir.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 11/19] 9p: darwin: meson: Allow VirtFS on Darwin, Christian Schoenebeck, 2022/03/07