Fix grouping of statements. This remove a potential panic in the soft

updates code.  While I'm here, remove an unintended trigraph.

Reviewed by:	Kirk McKusick <kirk@freebsd.org>
This commit is contained in:
Eivind Eklund 1998-12-07 17:23:45 +00:00
parent f865e453e5
commit 4979978b8d
1 changed files with 5 additions and 5 deletions

View File

@ -11,7 +11,7 @@
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
*
* $Id: vfs_bio.c,v 1.184 1998/10/31 15:31:22 peter Exp $
* $Id: vfs_bio.c,v 1.185 1998/11/18 09:00:47 dg Exp $
*/
/*
@ -497,9 +497,9 @@ bdwrite(struct buf * bp)
* requested by the soft dependency code.
*/
if ((vp = bp->b_vp) &&
(vp->v_type == VBLK && vp->v_specmountpoint &&
(vp->v_specmountpoint->mnt_flag & MNT_SOFTDEP)) ||
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)))
((vp->v_type == VBLK && vp->v_specmountpoint &&
(vp->v_specmountpoint->mnt_flag & MNT_SOFTDEP)) ||
(vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP))))
return;
if (numdirtybuffers >= hidirtybuffers)
@ -1739,7 +1739,7 @@ allocbuf(struct buf * bp, int size)
m = bp->b_pages[pageindex];
#ifdef VFS_BIO_DIAG
if (m->pindex != objoff)
panic("allocbuf: page changed offset??!!!?");
panic("allocbuf: page changed offset?!!!?");
#endif
bytesinpage = tinc;
if (tinc > (newbsize - toff))