summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-11-06 18:24:33 +0000
committerphk <phk@FreeBSD.org>2004-11-06 18:24:33 +0000
commitb877b7a042b7f1ff01c61c98cf54ca561707162b (patch)
treeb3b69a5dbf5a88379457d6e2e0f4733cbce344a4 /sys
parentdc2dab730aeb4019ebc3f5c74b5905a6eb7aacbd (diff)
downloadFreeBSD-src-b877b7a042b7f1ff01c61c98cf54ca561707162b.zip
FreeBSD-src-b877b7a042b7f1ff01c61c98cf54ca561707162b.tar.gz
Get even closer to not crashing ext2fs
Diffstat (limited to 'sys')
-rw-r--r--sys/gnu/ext2fs/ext2_mount.h1
-rw-r--r--sys/gnu/ext2fs/ext2_vfsops.c2
-rw-r--r--sys/gnu/fs/ext2fs/ext2_mount.h1
-rw-r--r--sys/gnu/fs/ext2fs/ext2_vfsops.c2
4 files changed, 2 insertions, 4 deletions
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 2c91a0e..413db0c 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -54,7 +54,6 @@ struct ext2mount {
u_long um_bptrtodb; /* indir ptr to disk block */
u_long um_seqinc; /* inc between seq blocks */
- struct g_geom *um_gp;
struct g_consumer *um_cp;
struct bufobj *um_bo;
};
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 4336c7c..905e7f7 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -808,7 +808,7 @@ ext2_unmount(mp, mntflags, td)
DROP_GIANT();
g_topology_lock();
- g_wither_geom_close(ump->um_gp, ENXIO);
+ g_wither_geom_close(ump->um_cp->geom, ENXIO);
g_topology_unlock();
PICKUP_GIANT();
vrele(ump->um_devvp);
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 2c91a0e..413db0c 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -54,7 +54,6 @@ struct ext2mount {
u_long um_bptrtodb; /* indir ptr to disk block */
u_long um_seqinc; /* inc between seq blocks */
- struct g_geom *um_gp;
struct g_consumer *um_cp;
struct bufobj *um_bo;
};
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 4336c7c..905e7f7 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -808,7 +808,7 @@ ext2_unmount(mp, mntflags, td)
DROP_GIANT();
g_topology_lock();
- g_wither_geom_close(ump->um_gp, ENXIO);
+ g_wither_geom_close(ump->um_cp->geom, ENXIO);
g_topology_unlock();
PICKUP_GIANT();
vrele(ump->um_devvp);
OpenPOWER on IntegriCloud