git: 996fe40e05c9 - stable/14 - Eliminate unneeded variables and computations.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Jan 2025 06:36:21 UTC
The branch stable/14 has been updated by mckusick:
URL: https://cgit.FreeBSD.org/src/commit/?id=996fe40e05c9b863ef029e27b6a44907a1d7fa4b
commit 996fe40e05c9b863ef029e27b6a44907a1d7fa4b
Author: Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2025-01-12 21:51:24 +0000
Commit: Kirk McKusick <mckusick@FreeBSD.org>
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);