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

- Remove the remaining now unnecessary checks for the buf's b_object being

Browse Source 
NULL.  See revision 1.421 for more detail.
 - Remove GIANT_REQUIRED from vfs_unbusy_pages().  Discussed with: jeff
This commit is contained in:
Alan Cox 2003-11-15 08:45:36 +00:00
parent 155b9987a3
commit 28c9416429
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/vfs_bio.c
View File

@ -1553,8 +1553,7 @@ vfs_vmio_release(bp)
vm_page_t m; vm_page_t m;
GIANT_REQUIRED; GIANT_REQUIRED;
if (bp->b_object != NULL) VM_OBJECT_LOCK(bp->b_object);
VM_OBJECT_LOCK(bp->b_object);
vm_page_lock_queues(); vm_page_lock_queues();
for (i = 0; i < bp->b_npages; i++) { for (i = 0; i < bp->b_npages; i++) {
m = bp->b_pages[i]; m = bp->b_pages[i];
@ -1592,8 +1591,7 @@ vfs_vmio_release(bp)
} }
} }
vm_page_unlock_queues(); vm_page_unlock_queues();
if (bp->b_object != NULL) VM_OBJECT_UNLOCK(bp->b_object);
VM_OBJECT_UNLOCK(bp->b_object);
pmap_qremove(trunc_page((vm_offset_t) bp->b_data), bp->b_npages); pmap_qremove(trunc_page((vm_offset_t) bp->b_data), bp->b_npages);
if (bp->b_bufsize) { if (bp->b_bufsize) {
@ -3291,8 +3289,6 @@ vfs_unbusy_pages(struct buf * bp)
{ {
int i; int i;
GIANT_REQUIRED;
runningbufwakeup(bp); runningbufwakeup(bp);
if (bp->b_flags & B_VMIO) { if (bp->b_flags & B_VMIO) {
vm_object_t obj; vm_object_t obj;
@ -3536,8 +3532,7 @@ vfs_bio_clrbuf(struct buf *bp)
if ((bp->b_flags & (B_VMIO | B_MALLOC)) == B_VMIO) { if ((bp->b_flags & (B_VMIO | B_MALLOC)) == B_VMIO) {
bp->b_flags &= ~B_INVAL; bp->b_flags &= ~B_INVAL;
bp->b_ioflags &= ~BIO_ERROR; bp->b_ioflags &= ~BIO_ERROR;
if (bp->b_object != NULL) VM_OBJECT_LOCK(bp->b_object);
VM_OBJECT_LOCK(bp->b_object);
if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) && if( (bp->b_npages == 1) && (bp->b_bufsize < PAGE_SIZE) &&
(bp->b_offset & PAGE_MASK) == 0) { (bp->b_offset & PAGE_MASK) == 0) {
mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1; mask = (1 << (bp->b_bufsize / DEV_BSIZE)) - 1;
@ -3581,8 +3576,7 @@ vfs_bio_clrbuf(struct buf *bp)
vm_page_unlock_queues(); vm_page_unlock_queues();
} }
unlock: unlock:
if (bp->b_object != NULL) VM_OBJECT_UNLOCK(bp->b_object);
VM_OBJECT_UNLOCK(bp->b_object);
bp->b_resid = 0; bp->b_resid = 0;
} else { } else {
clrbuf(bp); clrbuf(bp);