From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out203-205-251-84.mail.qq.com (unknown [203.205.251.84]) by sourceware.org (Postfix) with ESMTPS id 60F863858D35 for ; Wed, 4 Jan 2023 10:31:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 60F863858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foxmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foxmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672828264; bh=hbMX9cZxuWrVQnp598oImZRywzSjHWYCjmjfVdwDPyc=; h=From:To:Cc:Subject:Date; b=V9+/XX2Yd+i71l+Osexyg+ndZoRAbIBYDzPixnxzIVVKGOJMSAITduTzU99wEF7Sz 5ckR8HNH52Bevd4DXodKE/YfVN+mTvMOpZInpUhTCHqrRRwQ4KUrlsY+OC46+vkr/5 ApWLSnrvDjFxOc0QtBaO1Ur6npifRJClV2R+P3xM= Received: from localhost.localdomain ([81.71.100.192]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 7C3028DA; Wed, 04 Jan 2023 18:31:03 +0800 X-QQ-mid: xmsmtpt1672828263tngapjr71 Message-ID: X-QQ-XMAILINFO: MmPNY57tR1XnSTO9zCHoti00IblUqLUKdh6jTd3S9TsNtFbV+CUvKnIcWkGdGh MLFaHvMkfTa6Txzra/le6F+6YtwrYdctGAjA57o8ORMmOorpu3j2YzI83cz8fZs3Sm4FdHH3WGcJ sh30FgrKkW9saicqC1/r+gk5ErS1GDQJDsNm3DAwk/o/2IMzevCWUGVo/K4OphTggKAjqHepgO88 nQl3UrByqPa2nZTNuHt7aM8MMzlvTxo3lApgjvrVr+7IeOsA7/+h0zJry6KWTgLCP0XYbSU3R/Py /ewl4jpOs+k1xkXfmjmOL2ZJ7zOL3hwT/RRLliVkBzDQbMGiGj8lVLGziiihFln8ikTv5cYCg2bG z+dgfTN944yBP94hQRdIUYKYs9K/fFOnv3cU5qKgHYUGfFkjW8ybDAyB/n9APOW58uSfBIRXa9vO Ay1XNOS7jWwi0/VBRgKoIjmU5Z4lwKVX5zgKAfv1L8NfeWd9cO2N0WclCybKN97u3lxkpyQuvA6e CjmUqm8CHLlFUB46lqmv0C+4+X+D0o9Rf+kyy5w4RPytyzhvfkRxTbZk0OWp5FRlCFTh7BD2YuDY 7JlJAVna5CfWwrR/R5KyHGKjEgIxiAOsYh7/mixgktYmaDiGByAarunQqn0TXNj3e7xheobBTPaP kCoF4ryOEOgCnZhIB6Pb8XhctwV8dAdtP8YjfziO0UK/GlVU45Vu2Bqz7oAR2b7TNDnwJmaY17KY P3+/ivcJM4Qf4uvB0RgKimU2t1EP941GmmovFNNMcpKZUsMm1Itos+LIGnbFjJ3v2bi4qPHDu/qS lpLWKK70htB16ayUctiRGwI6auAYYsHGsTHZb2tYBCCoeCrtjz/wUO2d1fHLIMh/5gGZwDZ4cVTI IHIim4MbYA1dYSFNf3m/GeEqMODynXsWqKUs/Warcb6gMpC2vzX925i0lQ3od3rpoSy/UE49IIU8 7Sdbcdbq7WWsGxJ2QZSJw8UPyPa7jnnCodpNpv4a2lVAhvLucCuBgehztJNadMY7lAi/nAo9b0P3 PcjD3BygFgofusBg8oQlR+p2BpEOJj4dLjahmnfVFhYFcNzhyjGIJ+RSdyh5A= From: wangshuo_1994@foxmail.com To: libc-alpha@sourceware.org, samuel.thibault@ens-lyon.org Cc: abushwang Subject: [PATCH] hurd fcntl: remove duplicate do...while in LOCKED macro Date: Wed, 4 Jan 2023 18:30:57 +0800 X-OQ-MSGID: <20230104103057.2981298-1-wangshuo_1994@foxmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,HELO_DYNAMIC_IPADDR,RCVD_IN_MSPIKE_H2,RDNS_DYNAMIC,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: abushwang commit e1a467d introduces do...while for LOCKED macro. However, there is already while(0) in LOCKED macro according to HURD_CRITICAL_END in hurd/hurd/signal.h: #define HURD_CRITICAL_BEGIN \ { void *__hurd_critical__ = _hurd_critical_section_lock () #define HURD_CRITICAL_END \ _hurd_critical_section_unlock (__hurd_critical__); } while (0) It is robust enough. Signed-off-by: abushwang --- sysdeps/mach/hurd/fcntl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c index 48608493a1..ea35e9b977 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) do { \ +#define LOCKED(expr) \ HURD_CRITICAL_BEGIN; \ __spin_lock (&d->port.lock); \ if (d->port.port == MACH_PORT_NULL) \ @@ -117,8 +117,7 @@ __libc_fcntl (int fd, int cmd, ...) else \ result = (expr); \ __spin_unlock (&d->port.lock); \ - HURD_CRITICAL_END; \ -} while(0) + HURD_CRITICAL_END; case F_GETFD: /* Get descriptor flags. */ LOCKED (d->flags); -- 2.37.3