Page MenuHomeFreeBSD
Files F102766479

D27724.diff
No OneTemporary
Actions

D27724.diff
View Options

Index: sys/dev/md/md.c
===================================================================
--- sys/dev/md/md.c
+++ sys/dev/md/md.c
@@ -1012,11 +1012,11 @@
goto unmapped_step;
}
uma_zfree(md_pbuf_zone, pb);
+ } else {
+ bp->bio_resid = auio.uio_resid;
}
free(piov, M_MD);
- if (pb == NULL)
- bp->bio_resid = auio.uio_resid;
return (error);
}
@@ -1184,6 +1184,23 @@
return (0);
}
+static void
+md_handleattr(struct md_s *sc, struct bio *bp)
+{
+ if (sc->fwsectors && sc->fwheads &&
+ (g_handleattr_int(bp, "GEOM::fwsectors", sc->fwsectors) ||
+ g_handleattr_int(bp, "GEOM::fwheads", sc->fwheads)))
+ return;
+ if (g_handleattr_int(bp, "GEOM::candelete", 1))
+ return;
+ if (sc->ident[0] != '\0' &&
+ g_handleattr_str(bp, "GEOM::ident", sc->ident))
+ return;
+ if (g_handleattr_int(bp, "MNT::verified", (sc->flags & MD_VERIFY) != 0))
+ return;
+ g_io_deliver(bp, EOPNOTSUPP);
+}
+
static void
md_kthread(void *arg)
{
@@ -1212,39 +1229,21 @@
}
mtx_unlock(&sc->queue_mtx);
if (bp->bio_cmd == BIO_GETATTR) {
- int isv = ((sc->flags & MD_VERIFY) != 0);
-
- if ((sc->fwsectors && sc->fwheads &&
- (g_handleattr_int(bp, "GEOM::fwsectors",
- sc->fwsectors) ||
- g_handleattr_int(bp, "GEOM::fwheads",
- sc->fwheads))) ||
- g_handleattr_int(bp, "GEOM::candelete", 1))
- error = -1;
- else if (sc->ident[0] != '\0' &&
- g_handleattr_str(bp, "GEOM::ident", sc->ident))
- error = -1;
- else if (g_handleattr_int(bp, "MNT::verified", isv))
- error = -1;
- else
- error = EOPNOTSUPP;
+ md_handleattr(sc, bp);
} else {
error = sc->start(sc, bp);
- }
-
- if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) {
- /*
- * Devstat uses (bio_bcount, bio_resid) for
- * determining the length of the completed part of
- * the i/o. g_io_deliver() will translate from
- * bio_completed to that, but it also destroys the
- * bio so we must do our own translation.
- */
- bp->bio_bcount = bp->bio_length;
- bp->bio_resid = (error == -1 ? bp->bio_bcount : 0);
- devstat_end_transaction_bio(sc->devstat, bp);
- }
- if (error != -1) {
+ if (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE) {
+ /*
+ * Devstat uses (bio_bcount, bio_resid) for
+ * determining the length of the completed part
+ * of the i/o. g_io_deliver() will translate
+ * from bio_completed to that, but it also
+ * destroys the bio so we must do our own
+ * translation.
+ */
+ bp->bio_bcount = bp->bio_length;
+ devstat_end_transaction_bio(sc->devstat, bp);
+ }
bp->bio_completed = bp->bio_length;
g_io_deliver(bp, error);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 9:29 PM (22 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14684899
Default Alt Text
D27724.diff (2 KB)

Event Timeline