l_write returns a value; pass it on

[unix-history] / usr / src / sys / vax / uba / vp.c

diff --git a/usr/src/sys/vax/uba/vp.c b/usr/src/sys/vax/uba/vp.c
index ff9821c..692ddad 100644 (file)
--- a/usr/src/sys/vax/uba/vp.c
+++ b/usr/src/sys/vax/uba/vp.c
@@ -1,4 +1,4 @@
-/*     vp.c    4.18    82/09/12        */
+/*     vp.c    4.20    82/10/10        */

 
 #include "vp.h"
 #if NVP > 0
 
 #include "vp.h"
 #if NVP > 0


@@ -17,11 +17,12 @@
 #include "../h/systm.h"
 #include "../h/map.h"
 #include "../h/pte.h"
 #include "../h/systm.h"
 #include "../h/map.h"
 #include "../h/pte.h"

-#include "../h/ubavar.h"
-#include "../h/ubareg.h"

 #include "../h/vcmd.h"
 #include "../h/uio.h"
 
 #include "../h/vcmd.h"
 #include "../h/uio.h"
 

+#include "../vaxuba/ubavar.h"
+#include "../vaxuba/ubareg.h"
+

 unsigned minvpph();
 
 #define        VPPRI   (PZERO-1)
 unsigned minvpph();
 
 #define        VPPRI   (PZERO-1)


@@ -171,9 +172,9 @@ brkout:
        ubarelse(ui->ui_ubanum, &sc->sc_ubinfo);
        sc->sc_state &= ~VPSC_BUSY;
        sc->sc_bp = 0;
        ubarelse(ui->ui_ubanum, &sc->sc_ubinfo);
        sc->sc_state &= ~VPSC_BUSY;
        sc->sc_bp = 0;

-       iodone(bp);

        if (e)
        if (e)

-               u.u_error = EIO;
+               bp->b_flags |= B_ERROR;
+       iodone(bp);

        wakeup((caddr_t)sc);
 }
 
        wakeup((caddr_t)sc);
 }
 


@@ -214,7 +215,7 @@ vpwait(dev)
                        break;
                sleep((caddr_t)sc, VPPRI);
        }
                        break;
                sleep((caddr_t)sc, VPPRI);
        }

-       /* I wish i could tell whether an error indicated an npr timeout */
+       /* I WISH I COULD TELL WHETHER AN ERROR INDICATED AN NPR TIMEOUT */

        return (e & VP_ERROR);
 }
 
        return (e & VP_ERROR);
 }