diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-05-02 08:13:03 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2003-05-02 08:13:03 +0000 |
| commit | a0c89548a3f1a60400099b1041f225769ed3913d (patch) | |
| tree | d1003ca813ddc3ba5daaf42660572f39c90a019c /sys/geom | |
| parent | 994336cdd96c8e9d04b6e9c824bff882fdf8e089 (diff) | |
| download | src-a0c89548a3f1a60400099b1041f225769ed3913d.tar.gz src-a0c89548a3f1a60400099b1041f225769ed3913d.zip | |
Use g_slice_spoiled().
Free buffer from g_read_data().
Notes
Notes:
svn path=/head/; revision=114517
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/geom_mbr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 362e54089c8f..c0232a7ebb50 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_std_spoiled(cp); + g_slice_spoiled(cp); return (NULL); } return (gp); @@ -398,8 +398,10 @@ 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) + if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) { + g_free(buf); break; + } for (i = 0; i < NDOSPART; i++) dos_partition_dec( buf + DOSPARTOFF + @@ -440,7 +442,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_std_spoiled(cp); + g_slice_spoiled(cp); return (NULL); } return (gp); |