diff options
| author | phk <phk@FreeBSD.org> | 2003-05-02 06:42:59 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-05-02 06:42:59 +0000 |
| commit | 055cf65eb1d06904d69d4b58914213644ad8cb0d (patch) | |
| tree | bb8126af9ed3864ba67d3f80bced0b3ac8d831ee /sys/geom/geom_mbr.c | |
| parent | 9bb7fb74d1c16b096bf1753ef0429c85eb933304 (diff) | |
| download | FreeBSD-src-055cf65eb1d06904d69d4b58914213644ad8cb0d.zip FreeBSD-src-055cf65eb1d06904d69d4b58914213644ad8cb0d.tar.gz | |
Back out all the stuff that didn't belong in the last commit.
Diffstat (limited to 'sys/geom/geom_mbr.c')
| -rw-r--r-- | sys/geom/geom_mbr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index c0232a7..362e540 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -300,7 +300,7 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist) g_topology_lock(); g_access_rel(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { - g_slice_spoiled(cp); + g_std_spoiled(cp); return (NULL); } return (gp); @@ -398,10 +398,8 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) buf = g_read_data(cp, off, sectorsize, &error); if (buf == NULL || error != 0) break; - if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) { - g_free(buf); + if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) break; - } for (i = 0; i < NDOSPART; i++) dos_partition_dec( buf + DOSPARTOFF + @@ -442,7 +440,7 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) g_topology_lock(); g_access_rel(cp, -1, 0, 0); if (LIST_EMPTY(&gp->provider)) { - g_slice_spoiled(cp); + g_std_spoiled(cp); return (NULL); } return (gp); |
