From nobody Thu Jan 23 06:44:34 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 4Ydryp4CFYz5lk0h; Thu, 23 Jan 2025 06:44:34 +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 4Ydryp3KT3z3SKY; Thu, 23 Jan 2025 06:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737614674; 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=/us0cXdrYN/ooC8rlj8qgnwqUphXiQOSuG6qd03V+zs=; b=WcOG2F0Mv4ZeIvnKl4HxT60J5C5oRi4lbrEMBhtpA1nVwRxO2frFb/dSSV8RNLlLea4GrL VzAjDslCjSexM/MpoxDiiqKsDpBZiRfyX+X1bXDnUah8utWSGtphBM0Fe8Cl49bWOT5t9G NDTbmDa7JLt9M681h7Y0i3QDSSJNSIA53N8i6r1rxLoerx8lrt6Cc4gC26Er536eWJIZWH Vt4nCJIplpA9x4Ae1Mb/MKEB40REhM0tB2PPtFmb+wKvtMm/JhwKujyY33pHIYn+rg5SMI 2sKmfHzGLfeAoFWsoCX347CzdAA2Lc5Ovfpu3Iu9+KXic0cm3NvXTlGf4x2EdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737614674; 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=/us0cXdrYN/ooC8rlj8qgnwqUphXiQOSuG6qd03V+zs=; b=wCbRg9aY4+5TrrSI9WGHWnintqGBjEgbChFRNy/72AGdKStVWdX5AbtSRFdlA4Dac56l09 4PzAy3J2sjP/Hqzj1yCVOK7qBBCjsPVzmLY74rfXVGzJDwlCxr5/5HlHCAPhsZgxGRWrHL 7yr4w8MdFuR+jM7AFAS6MUvFhl3+YcU51kmSKbx1LHHD0VeTWfShixVQS0IbsgaTB3u0e3 Z36jvFCSXQOmmD6RPQNFYuLC1r35P8WmjIRzPtcV8tZ5B7mSaTepIVRxGvxJrtuGffCnf9 UgIpSF87SEfVWHQPLgp3/g05PWpTUwBCrJgaYAaQGQJt4uKnfItATn79RTjU6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737614674; a=rsa-sha256; cv=none; b=gdmljM+h7514Yz1uf1CpIEd3ipM0tRnydEfMwZ8hMDyKkrb4x/aRl6e/qy9R9V9FSzNRZz Wy7RvJwtfAwpyH5s2kq9gxZTTKcU3qJKpA6XCghhv7E0x2PDcAYCnlLFCy21urDf+zb2Vs UNqJpbtOmBbJ3+kf4ElDEJd2lrVNpWpUHt2yTaOR7lrvdmyFMDcEmriJlO1Udzfrojg4hI NX1fGIxoPanZyIX1ZD1BD6pbxA/b68wf+RshcD2EtkPNQ0FmUJEvlPu98Tg3m+eXV5LZ5e hREWrmVhY+lzNKJxxDEUJHkrmDgqSapEJTI++nHwKa9PbZQh4swghhlXjz/X/Q== 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 4Ydryp2VrBzCQ2; Thu, 23 Jan 2025 06:44:34 +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 50N6iY1L019490; Thu, 23 Jan 2025 06:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N6iY6d019487; Thu, 23 Jan 2025 06:44:34 GMT (envelope-from git) Date: Thu, 23 Jan 2025 06:44:34 GMT Message-Id: <202501230644.50N6iY6d019487@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: bb14579988c5 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: bb14579988c5d82a272578e77ea719603b237fb3 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=bb14579988c5d82a272578e77ea719603b237fb3 commit bb14579988c5d82a272578e77ea719603b237fb3 Author: Kirk McKusick AuthorDate: 2025-01-12 21:51:24 +0000 Commit: Kirk McKusick CommitDate: 2025-01-23 06:44:17 +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 e23e12cc8be4..9e65cddc0d8f 100644 --- a/sys/ufs/ffs/ffs_suspend.c +++ b/sys/ufs/ffs/ffs_suspend.c @@ -242,16 +242,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); @@ -263,7 +259,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);