From nobody Tue Feb 10 11:56:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768309359330724.0992919460614; Tue, 13 Jan 2026 05:02:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vfe0V-0006P8-Ct; Tue, 13 Jan 2026 08:00:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfe0Q-0006FC-3A; Tue, 13 Jan 2026 08:00:18 -0500 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vfe0O-00011u-Al; Tue, 13 Jan 2026 08:00:17 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 65DF517D9DE; Tue, 13 Jan 2026 16:00:05 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 604F034C415; Tue, 13 Jan 2026 16:00:10 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Michael Tokarev Subject: [PATCH 2/3] linux-user/syscall.c: consolidate statfs calls Date: Tue, 13 Jan 2026 16:00:01 +0300 Message-ID: <20260113130008.910240-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260113130008.910240-1-mjt@tls.msk.ru> References: <20260113130008.910240-1-mjt@tls.msk.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1768309361101158500 Content-Type: text/plain; charset="utf-8" group statfs&fstatfs together, eliminate goto into a different case label, eliminate struct statfs global to all syscalls. Ditto for statfs64. This makes code more readable and less scattered. While at it, drop `#ifdef TARGET_NR_fstatfs` -- assume fstatfs() is present together with statfs() - just like for fstatfs64. Signed-off-by: Michael Tokarev --- linux-user/syscall.c | 62 +++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index d32299dddb..1f84c296d5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9457,10 +9457,6 @@ static abi_long do_syscall1(CPUArchState *cpu_env, i= nt num, abi_long arg1, || defined(TARGET_NR_fstat) || defined(TARGET_NR_fstat64) \ || defined(TARGET_NR_statx) struct stat st; -#endif -#if defined(TARGET_NR_statfs) || defined(TARGET_NR_statfs64) \ - || defined(TARGET_NR_fstatfs) - struct statfs stfs; #endif void *p; =20 @@ -10978,15 +10974,22 @@ static abi_long do_syscall1(CPUArchState *cpu_env= , int num, abi_long arg1, return get_errno(setpriority(arg1, arg2, arg3)); #ifdef TARGET_NR_statfs case TARGET_NR_statfs: - if (!(p =3D lock_user_string(arg1))) { - return -TARGET_EFAULT; - } - ret =3D get_errno(statfs(path(p), &stfs)); - unlock_user(p, arg1, 0); - convert_statfs: - if (!is_error(ret)) { + case TARGET_NR_fstatfs: + { + struct statf stfs; struct target_statfs *target_stfs; - + if (num =3D=3D TARGET_NR_statfs) { + if (!(p =3D lock_user_string(arg1))) { + return -TARGET_EFAULT; + } + ret =3D get_errno(statfs(path(p), &stfs)); + unlock_user(p, arg1, 0); + } else /* if (num =3D=3D TARGET_NR_fstatfs) */ { + ret =3D get_errno(fstatfs(arg1, &stfs)); + } + if (is_error(ret)) { + return ret; + } if (!lock_user_struct(VERIFY_WRITE, target_stfs, arg2, 0)) return -TARGET_EFAULT; __put_user(stfs.f_type, &target_stfs->f_type); @@ -11003,25 +11006,27 @@ static abi_long do_syscall1(CPUArchState *cpu_env= , int num, abi_long arg1, __put_user(stfs.f_flags, &target_stfs->f_flags); memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); unlock_user_struct(target_stfs, arg2, 1); + return ret; } - return ret; -#endif -#ifdef TARGET_NR_fstatfs - case TARGET_NR_fstatfs: - ret =3D get_errno(fstatfs(arg1, &stfs)); - goto convert_statfs; #endif #ifdef TARGET_NR_statfs64 case TARGET_NR_statfs64: - if (!(p =3D lock_user_string(arg1))) { - return -TARGET_EFAULT; - } - ret =3D get_errno(statfs(path(p), &stfs)); - unlock_user(p, arg1, 0); - convert_statfs64: - if (!is_error(ret)) { + case TARGET_NR_fstatfs64: + { + struct statfs stfs; struct target_statfs64 *target_stfs; - + if (num =3D=3D TARGET_NR_statfs64) { + if (!(p =3D lock_user_string(arg1))) { + return -TARGET_EFAULT; + } + ret =3D get_errno(statfs(path(p), &stfs)); + unlock_user(p, arg1, 0); + } else /* if (num =3D=3D TARGET_NR_fstatfs64) */ { + ret =3D get_errno(fstatfs(arg1, &stfs)); + } + if (is_error(ret)) { + return ret; + } if (!lock_user_struct(VERIFY_WRITE, target_stfs, arg3, 0)) return -TARGET_EFAULT; __put_user(stfs.f_type, &target_stfs->f_type); @@ -11038,11 +11043,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env,= int num, abi_long arg1, __put_user(stfs.f_flags, &target_stfs->f_flags); memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); unlock_user_struct(target_stfs, arg3, 1); + return ret; } - return ret; - case TARGET_NR_fstatfs64: - ret =3D get_errno(fstatfs(arg1, &stfs)); - goto convert_statfs64; #endif #ifdef TARGET_NR_socketcall case TARGET_NR_socketcall: --=20 2.47.3