The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c1d93f81e49c5c32262eefcd087b9c5582e0f83c
commit c1d93f81e49c5c32262eefcd087b9c5582e0f83c
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2024-11-12 06:22:06 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2024-11-13 19:35:02 +0000
bufwrite(): style
Use bool for vp_md. Compactify the calculation.
Explicitly check for non-zero when testing flags.
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
---
sys/kern/vfs_bio.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 7bcc61c27109..3ef715baebfa 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -2304,10 +2304,10 @@ breadn_flags(struct vnode *vp, daddr_t blkno, daddr_t
dblkno, int size,
int
bufwrite(struct buf *bp)
{
- int oldflags;
struct vnode *vp;
long space;
- int vp_md;
+ int oldflags, retval;
+ bool vp_md;
CTR3(KTR_BUF, "bufwrite(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags);
if ((bp->b_bufobj->bo_flag & BO_DEAD) != 0) {
@@ -2316,24 +2316,21 @@ bufwrite(struct buf *bp)
brelse(bp);
return (ENXIO);
}
- if (bp->b_flags & B_INVAL) {
+ if ((bp->b_flags & B_INVAL) != 0) {
brelse(bp);
return (0);
}
- if (bp->b_flags & B_BARRIER)
+ if ((bp->b_flags & B_BARRIER) != 0)
atomic_add_long(&barrierwrites, 1);
oldflags = bp->b_flags;
- KASSERT(!(bp->b_vflags & BV_BKGRDINPROG),
+ KASSERT((bp->b_vflags & BV_BKGRDINPROG) == 0,
("FFS background buffer should not get here %p", bp));
vp = bp->b_vp;
- if (vp)
- vp_md = vp->v_vflag & VV_MD;
- else
- vp_md = 0;
+ vp_md = vp != NULL && (vp->v_vflag & VV_MD) != 0;
/*
* Mark the buffer clean. Increment the bufobj write count
@@ -2365,19 +2362,19 @@ bufwrite(struct buf *bp)
}
#endif /* RACCT */
curthread->td_ru.ru_oublock++;
- if (oldflags & B_ASYNC)
+ if ((oldflags & B_ASYNC) != 0)
BUF_KERNPROC(bp);
bp->b_iooffset = dbtob(bp->b_blkno);
buf_track(bp, __func__);
bstrategy(bp);
if ((oldflags & B_ASYNC) == 0) {
- int rtval = bufwait(bp);
+ retval = bufwait(bp);
brelse(bp);
- return (rtval);
+ return (retval);
} else if (space > hirunningspace) {
/*
- * don't allow the async write to saturate the I/O
+ * Don't allow the async write to saturate the I/O
* system. We will not deadlock here because
* we are blocking waiting for I/O that is already in-progress
* to complete. We do not block here if it is the update
