From c5be3924c32bb1aacfc27b884db5ef65f00fa7b8 Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 28 Sep 2002 17:46:30 +0000 Subject: Remove unused includes. Clarify the intention of a while(); Move a local variable to avoid potential name-confusion. --- sys/kern/vfs_bio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/kern') diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 46d136c..d53e532 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -40,9 +40,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -2516,7 +2514,8 @@ geteblk(int size) maxsize = (size + BKVAMASK) & ~BKVAMASK; s = splbio(); - while ((bp = getnewbuf(0, 0, size, maxsize)) == 0); + while ((bp = getnewbuf(0, 0, size, maxsize)) == 0) + continue; splx(s); allocbuf(bp, size); bp->b_flags |= B_INVAL; /* b_dep cleared by getnewbuf() */ @@ -2636,7 +2635,6 @@ allocbuf(struct buf *bp, int size) } } } else { - vm_page_t m; int desiredpages; newbsize = (size + DEV_BSIZE - 1) & ~(DEV_BSIZE - 1); @@ -2659,6 +2657,8 @@ allocbuf(struct buf *bp, int size) * if we have to remove any pages. */ if (desiredpages < bp->b_npages) { + vm_page_t m; + vm_page_lock_queues(); for (i = desiredpages; i < bp->b_npages; i++) { /* -- cgit v1.1