summaryrefslogtreecommitdiff
path: root/sys/arch/sgi
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-06-11 12:35:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-06-11 12:35:48 +0000
commitb2b0c7fef4a45b9670abe28fb02d4d6501aba3cf (patch)
treeb68620a361e298733e9f56b948838c732f923917 /sys/arch/sgi
parent737d3ccddb6f7c737402ff2b6608eef74cba85eb (diff)
back out biomem diff since it is not right yet. Doing very large
file copies to nfsv2 causes the system to eventually peg the console. On the console ^T indicates that the load is increasing rapidly, ddb indicates many calls to getbuf, there is some very slow nfs traffic making none (or extremely slow) progress. Eventually some machines seize up entirely.
Diffstat (limited to 'sys/arch/sgi')
-rw-r--r--sys/arch/sgi/sgi/disksubr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/sgi/sgi/disksubr.c b/sys/arch/sgi/sgi/disksubr.c
index 6a68ec41127..ef7ef682b6f 100644
--- a/sys/arch/sgi/sgi/disksubr.c
+++ b/sys/arch/sgi/sgi/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.4 2008/06/10 20:50:23 beck Exp $ */
+/* $OpenBSD: disksubr.c,v 1.5 2008/06/11 12:35:43 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -59,7 +59,7 @@ readbsdlabel(struct buf *bp, void (*strat)(struct buf *),
bp->b_blkno = sec;
bp->b_bcount = lp->d_secsize;
- bp->b_flags = B_BUSY | B_READ | B_RAW;
+ bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
/* if successful, locate disk label within block and validate */
@@ -145,7 +145,7 @@ readsgilabel(struct buf *bp, void (*strat)(struct buf *),
bp->b_blkno = 0;
bp->b_bcount = lp->d_secsize;
- bp->b_flags = B_BUSY | B_READ | B_RAW;
+ bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
/* if successful, locate disk label within block and validate */
@@ -215,7 +215,7 @@ finished:
bp->b_blkno = fsoffs + LABELSECTOR;
bp->b_bcount = lp->d_secsize;
- bp->b_flags = B_BUSY | B_READ | B_RAW;
+ bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
if (biowait(bp)) {
msg = "disk label I/O error";
@@ -249,14 +249,14 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp)
/* Read it in, slap the new label in, and write it back out */
bp->b_blkno = partoff + LABELSECTOR;
bp->b_bcount = lp->d_secsize;
- bp->b_flags = B_BUSY | B_READ | B_RAW;
+ bp->b_flags = B_BUSY | B_READ;
(*strat)(bp);
if ((error = biowait(bp)) != 0)
goto done;
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
*dlp = *lp;
- bp->b_flags = B_BUSY | B_WRITE | B_RAW;
+ bp->b_flags = B_BUSY | B_WRITE;
(*strat)(bp);
error = biowait(bp);