jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-02 21:32:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

diff, patch and cvs didn't like these three last time around, try again.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2000-03-20 12:34:21 +00:00
parent 30280e3601
commit ce6acbb664
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=58365
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/subr_disklabel.c
View File

@ -182,7 +182,7 @@ readdisklabel(dev, lp)
bp->b_bcount = lp->d_secsize;
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
if (biowait(bp))
msg = "I/O error";
else for (dlp = (struct disklabel *)bp->b_data;
@ -285,7 +285,7 @@ writedisklabel(dev, lp)
*/
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
error = biowait(bp);
if (error)
goto done;
@ -314,7 +314,7 @@ done:
*dlp = *lp;
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_WRITE;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
error = biowait(bp);
#endif
bp->b_flags |= B_INVAL | B_AGE;

4
sys/kern/subr_diskmbr.c
View File

@ -188,7 +188,7 @@ reread_mbr:
bp->b_blkno = mbr_offset;
bp->b_bcount = lp->d_secsize;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
if (biowait(bp) != 0) {
diskerr(bp, "reading primary partition table: error",
LOG_PRINTF, 0, (struct disklabel *)NULL);
@ -404,7 +404,7 @@ mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
bp->b_blkno = ext_offset;
bp->b_bcount = lp->d_secsize;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
if (biowait(bp) != 0) {
diskerr(bp, "reading extended partition table: error",
LOG_PRINTF, 0, (struct disklabel *)NULL);

2
sys/sys/conf.h
View File

@ -137,7 +137,7 @@ typedef void devfs_remove_t __P((dev_t dev));
* of surgery, reset the flag and restart all the stuff on the stall
* queue.
*/
#define BUF_STRATEGY(bp, dummy) \
#define DEV_STRATEGY(bp, dummy) \
do { \
if ((!(bp)->b_iocmd) || ((bp)->b_iocmd & ((bp)->b_iocmd - 1))) \
Debugger("d_iocmd botch"); \

2
sys/sys/linedisc.h
View File

@ -137,7 +137,7 @@ typedef void devfs_remove_t __P((dev_t dev));
* of surgery, reset the flag and restart all the stuff on the stall
* queue.
*/
#define BUF_STRATEGY(bp, dummy) \
#define DEV_STRATEGY(bp, dummy) \
do { \
if ((!(bp)->b_iocmd) || ((bp)->b_iocmd & ((bp)->b_iocmd - 1))) \
Debugger("d_iocmd botch"); \

6
sys/ufs/ufs/ufs_disksubr.c
View File

@ -182,7 +182,7 @@ readdisklabel(dev, lp)
bp->b_bcount = lp->d_secsize;
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
if (biowait(bp))
msg = "I/O error";
else for (dlp = (struct disklabel *)bp->b_data;
@ -285,7 +285,7 @@ writedisklabel(dev, lp)
*/
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_READ;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
error = biowait(bp);
if (error)
goto done;
@ -314,7 +314,7 @@ done:
*dlp = *lp;
bp->b_flags &= ~B_INVAL;
bp->b_iocmd = BIO_WRITE;
BUF_STRATEGY(bp, 1);
DEV_STRATEGY(bp, 1);
error = biowait(bp);
#endif
bp->b_flags |= B_INVAL | B_AGE;