From 14dc1a5da3bd92576869dd51ab99fa56888fff43 Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Sat, 7 Jul 2018 18:37:45 -0400
Subject: [PATCH] kernel: getblk_common's 5th arg can be a bool

Don't abuse ints like it's 1989.
---
 include/sys/buf.h        | 5 ++---
 include/sys/fs/ufs_bio.h | 4 ++--
 kernel/os/bio.c          | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/sys/buf.h b/include/sys/buf.h
index 8a7275bf80..955c891036 100644
--- a/include/sys/buf.h
+++ b/include/sys/buf.h
@@ -341,7 +341,7 @@ int	bp_color(struct buf *);
 void	pageio_done(struct buf *);
 struct buf *bread_common(void *, dev_t, daddr_t, long);
 struct buf *breada(dev_t, daddr_t, daddr_t, long);
-struct buf *getblk_common(void *, dev_t, daddr_t, long, int);
+struct buf *getblk_common(void *, dev_t, daddr_t, long, bool);
 struct buf *ngeteblk(long);
 struct buf *geteblk(void);
 struct buf *pageio_setup(struct page *, size_t, struct vnode *, int);
@@ -390,8 +390,7 @@ static inline void bwrite2(struct buf *bp)
  */
 static inline struct buf *getblk(dev_t dev, daddr_t blkno, long bsize)
 {
-	return getblk_common(/* ufsvfsp */ NULL, dev, blkno, bsize,
-			     /* errflg */ 0);
+	return getblk_common(NULL, dev, blkno, bsize, false);
 }
 
 /*
diff --git a/include/sys/fs/ufs_bio.h b/include/sys/fs/ufs_bio.h
index fef9d2c30f..de8e42c491 100644
--- a/include/sys/fs/ufs_bio.h
+++ b/include/sys/fs/ufs_bio.h
@@ -65,7 +65,7 @@ extern struct buf *bread_common(void *arg, dev_t dev,
 extern void bwrite_common(void *arg, struct buf *bp, bool force_wait,
 					bool do_relse, int clear_flags);
 extern struct buf *getblk_common(void * arg, dev_t dev,
-					daddr_t blkno, long bsize, int flag);
+					daddr_t blkno, long bsize, bool flag);
 
 #define	UFS_BREAD(ufsvfsp, dev, blkno, bsize)	\
 	bread_common(ufsvfsp, dev, blkno, bsize)
@@ -80,7 +80,7 @@ extern struct buf *getblk_common(void * arg, dev_t dev,
 	bwrite_common(ufsvfsp, bp, true, false, \
 	/* clear_flags */ (B_READ | B_DONE | B_ERROR | B_DELWRI))
 #define	UFS_GETBLK(ufsvfsp, dev, blkno, bsize)	\
-	getblk_common(ufsvfsp, dev, blkno, bsize, /* errflg */ 0)
+	getblk_common(ufsvfsp, dev, blkno, bsize, false)
 
 #endif	/* defined(_KERNEL) */
 
diff --git a/kernel/os/bio.c b/kernel/os/bio.c
index 9ac7e7b1b5..675e60a4ba 100644
--- a/kernel/os/bio.c
+++ b/kernel/os/bio.c
@@ -206,7 +206,7 @@ bread_common(void *arg, dev_t dev, daddr_t blkno, long bsize)
 	klwp_t *lwp = ttolwp(curthread);
 
 	CPU_STATS_ADD_K(sys, lread, 1);
-	bp = getblk_common(ufsvfsp, dev, blkno, bsize, /* errflg */ 1);
+	bp = getblk_common(ufsvfsp, dev, blkno, bsize, true);
 	if (bp->b_flags & B_DONE)
 		return (bp);
 	bp->b_flags |= B_READ;
@@ -517,7 +517,7 @@ bio_busy(int cleanit)
  * for the oldest non-busy buffer and reassign it.
  */
 struct buf *
-getblk_common(void * arg, dev_t dev, daddr_t blkno, long bsize, int errflg)
+getblk_common(void * arg, dev_t dev, daddr_t blkno, long bsize, bool errflg)
 {
 	ufsvfs_t *ufsvfsp = (struct ufsvfs *)arg;
 	struct buf *bp;
-- 
2.11.4.GIT