From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>, commit-hurd@gnu.org
Subject: [hurd,commited 6/7] hurd fcntl: Make LOCKED macro more robust
Date: Mon, 2 Jan 2023 11:09:37 +0100 [thread overview]
Message-ID: <20230102100938.2778311-7-samuel.thibault@ens-lyon.org> (raw)
In-Reply-To: <20230102100938.2778311-1-samuel.thibault@ens-lyon.org>
---
sysdeps/mach/hurd/fcntl.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c
index ea35e9b977..48608493a1 100644
--- a/sysdeps/mach/hurd/fcntl.c
+++ b/sysdeps/mach/hurd/fcntl.c
@@ -109,7 +109,7 @@ __libc_fcntl (int fd, int cmd, ...)
/* Set RESULT by evaluating EXPR with the descriptor locked.
Check for an empty descriptor and return EBADF. */
-#define LOCKED(expr) \
+#define LOCKED(expr) do { \
HURD_CRITICAL_BEGIN; \
__spin_lock (&d->port.lock); \
if (d->port.port == MACH_PORT_NULL) \
@@ -117,7 +117,8 @@ __libc_fcntl (int fd, int cmd, ...)
else \
result = (expr); \
__spin_unlock (&d->port.lock); \
- HURD_CRITICAL_END;
+ HURD_CRITICAL_END; \
+} while(0)
case F_GETFD: /* Get descriptor flags. */
LOCKED (d->flags);
--
2.39.0
next prev parent reply other threads:[~2023-01-02 10:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 10:09 [hurd,commited 0/7] hurd: fixes Samuel Thibault
2023-01-02 10:09 ` [hurd,commited 1/7] htl: Check error returned by __getrlimit Samuel Thibault
2023-01-02 10:09 ` [hurd,commited 2/7] hurd _S_msg_add_auth: Initialize new arrays to 0 Samuel Thibault
2023-01-02 10:09 ` [hurd,commited 3/7] hurd hurdstartup: Initialize remaining fields of hurd_startup_data Samuel Thibault
2023-01-02 10:09 ` [hurd,commited 4/7] htl: Drop duplicate check in __pthread_stack_alloc Samuel Thibault
2023-01-02 10:09 ` [hurd,commited 5/7] hurd: Make dl-sysdep __sbrk check __vm_allocate call Samuel Thibault
2023-01-02 10:09 ` Samuel Thibault [this message]
2023-01-02 10:09 ` [hurd,commited 7/7] hurd getcwd: Fix memory leak on error Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230102100938.2778311-7-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=commit-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).