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_vol_ffs.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_vol_ffs.c')
| -rw-r--r-- | sys/geom/geom_vol_ffs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/geom/geom_vol_ffs.c b/sys/geom/geom_vol_ffs.c index 7fedfc1..a01af4d 100644 --- a/sys/geom/geom_vol_ffs.c +++ b/sys/geom/geom_vol_ffs.c @@ -89,12 +89,8 @@ g_vol_ffs_taste(struct g_class *mp, struct g_provider *pp, int flags) for (sb=0; (superblock = superblocks[sb]) != -1; sb++) { fs = (struct fs *) g_read_data(cp, superblock, SBLOCKSIZE, &error); - if (fs == NULL) + if (fs == NULL || error != 0) continue; - if (error != 0) { - g_free(fs); - continue; - } /* Check for magic and make sure things are the right size */ if (fs->fs_magic == FS_UFS1_MAGIC) { if (fs->fs_old_size * fs->fs_fsize != @@ -132,7 +128,7 @@ g_vol_ffs_taste(struct g_class *mp, struct g_provider *pp, int flags) 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); |
