d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allocbuf(): convert direct panic() calls to KASSERT()s

Browse Source 
Also do minor style adjustments.

Reviewed by:	markj
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D38549
This commit is contained in:
Konstantin Belousov 2023-02-11 20:03:22 +02:00
parent d099194818
commit 020e8a4d06
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/vfs_bio.c
View File

@ -4363,8 +4363,9 @@ allocbuf(struct buf *bp, int size)
if (bp->b_bcount == size)
return (1);
if (bp->b_kvasize != 0 && bp->b_kvasize < size)
panic("allocbuf: buffer too small");
KASSERT(bp->b_kvasize == 0 || bp->b_kvasize >= size,
("allocbuf: buffer too small %p %#x %#x",
bp, bp->b_kvasize, size));
newbsize = roundup2(size, DEV_BSIZE);
if ((bp->b_flags & B_VMIO) == 0) {
@ -4381,11 +4382,12 @@ allocbuf(struct buf *bp, int size)
} else {
int desiredpages;
desiredpages = (size == 0) ? 0 :
desiredpages = size == 0 ? 0 :
num_pages((bp->b_offset & PAGE_MASK) + newbsize);
if (bp->b_flags & B_MALLOC)
panic("allocbuf: VMIO buffer can't be malloced");
KASSERT((bp->b_flags & B_MALLOC) == 0,
("allocbuf: VMIO buffer can't be malloced %p", bp));
/*
* Set B_CACHE initially if buffer is 0 length or will become
* 0-length.