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

More b_flags fixes.

Browse Source
This commit is contained in:
John Dyson 1996-03-02 01:49:51 +00:00
parent d52b14d769
commit 33309c7fc0
5 changed files with 16 additions and 16 deletions

6
sys/i386/isa/diskslice_machdep.c

@ -35,7 +35,7 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: diskslice_machdep.c,v 1.17 1995/10/28 15:38:55 phk Exp $
* $Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $
*/
#include <stddef.h>
@ -193,7 +193,7 @@ reread_mbr:
bp->b_dev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART);
bp->b_blkno = mbr_offset;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
if (biowait(bp) != 0) {
diskerr(bp, dname, "error reading primary partition table",
@ -380,7 +380,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset,
bp->b_dev = dev;
bp->b_blkno = ext_offset;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
if (biowait(bp) != 0) {
diskerr(bp, dname, "error reading extended partition table",

8
sys/kern/subr_disklabel.c

@ -254,7 +254,7 @@ readdisklabel(dev, strat, lp)
bp->b_dev = dev;
bp->b_blkno = LABELSECTOR;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
(*strat)(bp);
if (biowait(bp))
@ -363,7 +363,7 @@ writedisklabel(dev, strat, lp)
* Note that you can't write a label out over a corrupted label!
* (also stupid.. how do you write the first one? by raw writes?)
*/
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
error = biowait(bp);
if (error)
@ -375,7 +375,7 @@ writedisklabel(dev, strat, lp)
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {
*dlp = *lp;
bp->b_flags = B_BUSY | B_WRITE;
bp->b_flags |= B_BUSY | B_WRITE;
(*strat)(bp);
error = biowait(bp);
goto done;
@ -387,7 +387,7 @@ done:
bzero(bp->b_data, lp->d_secsize);
dlp = (struct disklabel *)bp->b_data;
*dlp = *lp;
bp->b_flags = B_BUSY | B_WRITE;
bp->b_flags |= B_BUSY | B_WRITE;
(*strat)(bp);
error = biowait(bp);
#endif

6
sys/kern/subr_diskmbr.c

@ -35,7 +35,7 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: diskslice_machdep.c,v 1.17 1995/10/28 15:38:55 phk Exp $
* $Id: diskslice_machdep.c,v 1.18 1996/03/01 19:00:53 dyson Exp $
*/
#include <stddef.h>
@ -193,7 +193,7 @@ reread_mbr:
bp->b_dev = dkmodpart(dkmodslice(dev, WHOLE_DISK_SLICE), RAW_PART);
bp->b_blkno = mbr_offset;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
if (biowait(bp) != 0) {
diskerr(bp, dname, "error reading primary partition table",
@ -380,7 +380,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset,
bp->b_dev = dev;
bp->b_blkno = ext_offset;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
if (biowait(bp) != 0) {
diskerr(bp, dname, "error reading extended partition table",

4
sys/scsi/scsi_ioctl.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*End copyright
*
* $Id: scsi_ioctl.c,v 1.18 1995/12/14 09:54:27 phk Exp $
* $Id: scsi_ioctl.c,v 1.19 1996/01/05 20:12:46 wollman Exp $
*
*
*/
@ -318,7 +318,7 @@ struct proc *p, struct scsi_link *sc_link)
/* if no data, no need to translate it.. */
bp->b_un.b_addr = 0;
bp->b_dev = dev;
bp->b_flags = B_BUSY;
bp->b_flags |= B_BUSY;
scsistrategy(bp);
ret = bp->b_error;

8
sys/ufs/ufs/ufs_disksubr.c

@ -254,7 +254,7 @@ readdisklabel(dev, strat, lp)
bp->b_dev = dev;
bp->b_blkno = LABELSECTOR;
bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
(*strat)(bp);
if (biowait(bp))
@ -363,7 +363,7 @@ writedisklabel(dev, strat, lp)
* Note that you can't write a label out over a corrupted label!
* (also stupid.. how do you write the first one? by raw writes?)
*/
bp->b_flags = B_BUSY | B_READ;
bp->b_flags |= B_BUSY | B_READ;
(*strat)(bp);
error = biowait(bp);
if (error)
@ -375,7 +375,7 @@ writedisklabel(dev, strat, lp)
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {
*dlp = *lp;
bp->b_flags = B_BUSY | B_WRITE;
bp->b_flags |= B_BUSY | B_WRITE;
(*strat)(bp);
error = biowait(bp);
goto done;
@ -387,7 +387,7 @@ done:
bzero(bp->b_data, lp->d_secsize);
dlp = (struct disklabel *)bp->b_data;
*dlp = *lp;
bp->b_flags = B_BUSY | B_WRITE;
bp->b_flags |= B_BUSY | B_WRITE;
(*strat)(bp);
error = biowait(bp);
#endif