From 94ce799f82a1d3b7453b1942016f91334c838b85 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 29 Oct 2012 19:35:56 +0100 Subject: Hurd: fix fdatasync/fsync if the fd does not support file_sync Handle the case of the fd port implementing a stub (EOPNOTSUPP), properly returning EINVAL. --- ChangeLog | 4 ++++ sysdeps/mach/hurd/fdatasync.c | 8 +++++++- sysdeps/mach/hurd/fsync.c | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cfa229b5e..d2c7cc7509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-10-29 Pino Toscano + * sysdeps/mach/hurd/fdatasync.c: Turn ERR into EINVAL if it is + EOPNOTSUPP. + * sysdeps/mach/hurd/fsync.c: Likewise. + * sysdeps/pthread/aio_notify.c (__aio_notify_only) [_POSIX_REALTIME_SIGNALS]: Change condition to [_POSIX_REALTIME_SIGNALS > 0]. diff --git a/sysdeps/mach/hurd/fdatasync.c b/sysdeps/mach/hurd/fdatasync.c index 19d7a4a58a..22c1d103d4 100644 --- a/sysdeps/mach/hurd/fdatasync.c +++ b/sysdeps/mach/hurd/fdatasync.c @@ -26,6 +26,12 @@ fdatasync (int fd) { error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 1)); if (err) - return __hurd_dfail (fd, err); + { + if (err == EOPNOTSUPP) + /* If the file descriptor does not support sync, return EINVAL + as POSIX specifies. */ + err = EINVAL; + return __hurd_dfail (fd, err); + } return 0; } diff --git a/sysdeps/mach/hurd/fsync.c b/sysdeps/mach/hurd/fsync.c index a474c8a356..fe3e044a3a 100644 --- a/sysdeps/mach/hurd/fsync.c +++ b/sysdeps/mach/hurd/fsync.c @@ -27,6 +27,12 @@ fsync (fd) { error_t err = HURD_DPORT_USE (fd, __file_sync (port, 1, 0)); if (err) - return __hurd_dfail (fd, err); + { + if (err == EOPNOTSUPP) + /* If the file descriptor does not support sync, return EINVAL + as POSIX specifies. */ + err = EINVAL; + return __hurd_dfail (fd, err); + } return 0; } -- cgit v1.2.3