From nobody Sun Jan 12 21:52:21 2025 X-Original-To: dev-commits-src-main@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 4YWTdK52qWz5jtQW; Sun, 12 Jan 2025 21:52: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 4YWTdK4H1Nz4lKd; Sun, 12 Jan 2025 21:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736718741; 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=wZ6c1WiEFhWA2RTY3ckaBmSlvxSRvz6vOZBE3s0xR14=; b=Cx6/zSsO+YpV/UQAydXkdtfdwiJv2d2alu5cP6tFuvo3r+bYKykkB0MLtNk9Hzoqok64e7 Wx10sym/yg6WXsQnkn00oZzoUVKUrFBVdQHywh0kzEsZ16BUNeHDocpoq2jyc/vseFSJK3 XhzZKHDUh0oKpxB8oPlCmn07oe+tcMBwLgl+/KUpZFmdGEk/PqTaeGuItys4hHzxFDSAWZ 0Hw1frbqhfIM6T74ZQo5HX5BKyGCR153e6Z0VCKnSpIHVkqVDbnL8CgwW8cplyi8Ef/UoR jxNsgrIi06yjkjhdvjOth3L2KB3XpqEO3kafeV7AQV0O7JGZOfwbfQZ3achkwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736718741; 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=wZ6c1WiEFhWA2RTY3ckaBmSlvxSRvz6vOZBE3s0xR14=; b=U00wK4AbDpCoDy36XHhOb6GIfn9rfXoIQVque2LFYO4r+ZWtXoBDPIjJHiV3XoJXsJ77vN iI8hxOy1DWjbW92MmvbihnujCXntrfNPON7KlYruBOn3b9u8W9tPHeAzmdIt+Ft72rRUSR b0MSffZAIJi6Ie/tLJCNFf0ymoXT2KyteH5rWtcVn5Kpg9J82vd9V2ywokHnUQfllJwgla vv8krKsF7iS4HOg5om5377NnvSURVs4fUBPx0C+pkrdFmugJetUijdMt1eg5s8AWcqRmsC C1B4Hb8u368NE6NcCfTfvtwSryKxiig4JQKd298lPqP6/4paR3RNDToB4iGRaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736718741; a=rsa-sha256; cv=none; b=Fa8l9E1n09S1A1OIGFoU6FL5T/xwGHcCjUGORAYPViuyUB82tscVwGIOLRf1hoXw7pOfdr YeC1eZ7m/58otBxSKA6KNTk8HM5nxjoVt1GMEpfWzuTgFRoVKE7CHl1j7lq5eTguaiLpcU t9ZC4Elq+I/UweLi/2LdcDwrdAgGDrIFeKoDLVIN1a8IoyNjavafH8DFPIjYxxbqYQRXkx MFOlLvH6RkS3sT7vx6VRXZISmwVIjTj8DKr+/OP/ZTfw2dsrTh9PQGhOzomUtegZjZUYjq NcXHeDjZ2J3GmGGKiOkoJASo/GfrwkzBJ8ki/8ZBXMWNvhNwZZAOtq4J0R1MSQ== 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 4YWTdK3sMDz12W0; Sun, 12 Jan 2025 21:52: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 50CLqLFG014750; Sun, 12 Jan 2025 21:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CLqLvK014747; Sun, 12 Jan 2025 21:52:21 GMT (envelope-from git) Date: Sun, 12 Jan 2025 21:52:21 GMT Message-Id: <202501122152.50CLqLvK014747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: df48361e7792 - main - Eliminate unneeded variables and computations. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: df48361e7792f9a9e6371f95c1228d4af2808d2a Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=df48361e7792f9a9e6371f95c1228d4af2808d2a commit df48361e7792f9a9e6371f95c1228d4af2808d2a Author: Kirk McKusick AuthorDate: 2025-01-12 21:51:24 +0000 Commit: Kirk McKusick CommitDate: 2025-01-12 21:52:07 +0000 Eliminate unneeded variables and computations. No functional change. MFC-after: 1 week --- 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);