From nobody Thu Jan 23 06:36:21 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YdrnK4Msvz5ljQ7; Thu, 23 Jan 2025 06:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdrnK2tRlz3RQM; Thu, 23 Jan 2025 06:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737614181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KagLGCtijYCYEkTMNd/KX6fNE9wP2tfFPxxj8L31qXM=; b=fxqnWFjlA1NPH79IvH1CnitUphT9zRt8XCHrXuhr4wm9WSYF1ZsrviStoMBQRleGpSkSN2 P7vnQlPa+fugmOPgM1HVjXU0pwQstXUgZ4BuTmU8G9kFZX761+RT987yXe40OwnfKHCxos OT+9RnzBvrwgNmjZazWqnJQTwyLCQ+1g3Qz3+ZwK8KgkDfR+FtSsgPF7mYnL2G1ZM/7MIq PeEFpXQ+Qx264JiGbIu4iQ1dy3wGYwXjMsFivzSdUZYsy3qJVkZzi722XNaK/L6FUzC6cI W1PKDa/yLTecniKfgrA6eEZZBXR3V8F1+Z8ER6jbj2hlnf9TG0u54gJu1aFUPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737614181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KagLGCtijYCYEkTMNd/KX6fNE9wP2tfFPxxj8L31qXM=; b=C/lBsakDdun90SZfnlBglAXWYBiOlAuUgnIWMNUVfuaZ52Yltt3asjKJPDnpiDEYdQg5yE 1lB74xmqXvi3z9T9N1xku3RRlc/9uyV4jZaDwGFIvkmGtEttBUdVFLeudfpCe0GbBMLgPG jPKpdwplLpDpwShiv+oNx4q7AAB2XmZezEQXgOFQ8H3s1/nsbPt8kQuSn5qbQ5nIS33tFy QtM3WSyzl1NuVv+6X8uUXMLHGDVs30GhPpZHvc3KOMyfOvVzlY2QgnwK5bt5K9LINv14LH 8FcsYVVBXIsi/DcUAbn4Engv4/indIwsZE1+bvwiL/7HF3V7ZXnOaJefH6DZ4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737614181; a=rsa-sha256; cv=none; b=R/+zZ2hQ3W7iaFNjaf7B9SEW+BM3xl/zKseEcshP1tMQw3Q2dSktaJ7qIOBJHEQfELu4At 9UCzUCt+GgcOjSiYmhNtdEw2v5cuJtKaJa3bFr2fvPkQka+OWTHGFmYzqiABIZdzRaAjiy BYXLQ4UCuLl4G1EwbanRiNG5DouhfskNMsK4EvVkr4rh68Kqec58qvrd8H7kuatgxbHsMh 98dA5it054aPbrm8nRRkWKzrPAsf7l51j31vlz9EKvCR5UwnuvRCKkM5tdTsgsBAwPUpcC pFlo29iKJIOfUv4ewZULL9qhGoDhZWue5OPOIigxbiHemILSaQIc6Djw0CN2tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YdrnK2D8PzBt8; Thu, 23 Jan 2025 06:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50N6aLmI001252; Thu, 23 Jan 2025 06:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N6aLGC001249; Thu, 23 Jan 2025 06:36:21 GMT (envelope-from git) Date: Thu, 23 Jan 2025 06:36:21 GMT Message-Id: <202501230636.50N6aLGC001249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 996fe40e05c9 - stable/14 - Eliminate unneeded variables and computations. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 996fe40e05c9b863ef029e27b6a44907a1d7fa4b Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=996fe40e05c9b863ef029e27b6a44907a1d7fa4b commit 996fe40e05c9b863ef029e27b6a44907a1d7fa4b Author: Kirk McKusick AuthorDate: 2025-01-12 21:51:24 +0000 Commit: Kirk McKusick CommitDate: 2025-01-23 06:36:04 +0000 Eliminate unneeded variables and computations. No functional change. (cherry picked from commit df48361e7792f9a9e6371f95c1228d4af2808d2a) --- sys/ufs/ffs/ffs_suspend.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c index 3afbab82cba5..c35831c4bb96 100644 --- a/sys/ufs/ffs/ffs_suspend.c +++ b/sys/ufs/ffs/ffs_suspend.c @@ -245,16 +245,12 @@ ffs_susp_unsuspend(struct mount *mp) static void ffs_susp_dtor(void *data) { - struct fs *fs; - struct ufsmount *ump; struct mount *mp; int error; sx_xlock(&ffs_susp_lock); mp = (struct mount *)data; - ump = VFSTOUFS(mp); - fs = ump->um_fs; if (ffs_susp_suspended(mp) == 0) { sx_xunlock(&ffs_susp_lock); @@ -266,7 +262,8 @@ ffs_susp_dtor(void *data) error = ffs_reload(mp, FFSR_FORCE | FFSR_UNSUSPEND); if (error != 0) - panic("failed to unsuspend writes on %s", fs->fs_fsmnt); + panic("failed to unsuspend writes on %s", + VFSTOUFS(mp)->um_fs->fs_fsmnt); ffs_susp_unsuspend(mp); sx_xunlock(&ffs_susp_lock);