git: 3541b0ee1ccd - main - ffs_bdflush(): remove an alias for devvp

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Thu, 19 Nov 2026 12:18:27 UTC
The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=3541b0ee1ccde668e106a17a0f36d03e52afc0fb

commit 3541b0ee1ccde668e106a17a0f36d03e52afc0fb
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2026-11-17 19:19:59 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2026-11-19 12:17:46 +0000

    ffs_bdflush(): remove an alias for devvp
    
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
---
 sys/ufs/ffs/ffs_snapshot.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index c32033f5b28f..1a6e6b880822 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -2217,7 +2217,7 @@ ffs_devvp_bdflush_fsync(void *arg, int pending)
 void
 ffs_bdflush(struct bufobj *bo, struct buf *bp)
 {
-	struct vnode *vp, *devvp;
+	struct vnode *devvp;
 	struct buf *nbp;
 	struct ufsmount *ump;
 	int bp_bdskip;
@@ -2225,9 +2225,8 @@ ffs_bdflush(struct bufobj *bo, struct buf *bp)
 	if (bo->bo_dirty.bv_cnt <= dirtybufthresh)
 		return;
 
-	vp = bp->b_vp;
 	devvp = bo2vnode(bo);
-	KASSERT(vp == devvp, ("devvp != vp %p %p", bo, bp));
+	KASSERT(bp->b_vp == devvp, ("devvp != vp %p %p", bo, bp));
 
 	VI_LOCK(devvp);
 	bp_bdskip = ffs_bp_snapblk(devvp, bp);
@@ -2261,7 +2260,7 @@ ffs_bdflush(struct bufobj *bo, struct buf *bp)
 			}
 			if (bp_bdskip) {
 				VI_LOCK(devvp);
-				if (!ffs_bp_snapblk(vp, nbp)) {
+				if (!ffs_bp_snapblk(devvp, nbp)) {
 					VI_UNLOCK(devvp);
 					BO_LOCK(bo);
 					BUF_UNLOCK(nbp);