diff options
| author | kib <kib@FreeBSD.org> | 2012-10-22 17:50:54 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2012-10-22 17:50:54 +0000 |
| commit | 560aa751e0f5cfef868bdf3fab01cdbc5169ef82 (patch) | |
| tree | 6e9ef0a47c5e91d26227820c50c9767e84550821 /sys/geom/geom_vfs.c | |
| parent | ca71b68ea40c83f641d6485e027368568f244197 (diff) | |
| download | FreeBSD-src-560aa751e0f5cfef868bdf3fab01cdbc5169ef82.zip FreeBSD-src-560aa751e0f5cfef868bdf3fab01cdbc5169ef82.tar.gz | |
Remove the support for using non-mpsafe filesystem modules.
In particular, do not lock Giant conditionally when calling into the
filesystem module, remove the VFS_LOCK_GIANT() and related
macros. Stop handling buffers belonging to non-mpsafe filesystems.
The VFS_VERSION is bumped to indicate the interface change which does
not result in the interface signatures changes.
Conducted and reviewed by: attilio
Tested by: pho
Diffstat (limited to 'sys/geom/geom_vfs.c')
| -rw-r--r-- | sys/geom/geom_vfs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index ade1790..afc6549 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/vnode.h> -#include <sys/mount.h> /* XXX Temporary for VFS_LOCK_GIANT */ +#include <sys/mount.h> #include <geom/geom.h> #include <geom/geom_vfs.h> @@ -94,7 +94,7 @@ g_vfs_done(struct bio *bip) struct g_consumer *cp; struct g_vfs_softc *sc; struct buf *bp; - int vfslocked, destroy; + int destroy; struct mount *mp; struct vnode *vp; struct cdev *cdevp; @@ -158,9 +158,7 @@ g_vfs_done(struct bio *bip) if (destroy) g_post_event(g_vfs_destroy, cp, M_WAITOK, NULL); - vfslocked = VFS_LOCK_GIANT(((struct mount *)NULL)); bufdone(bp); - VFS_UNLOCK_GIANT(vfslocked); } void @@ -169,7 +167,6 @@ g_vfs_strategy(struct bufobj *bo, struct buf *bp) struct g_vfs_softc *sc; struct g_consumer *cp; struct bio *bip; - int vfslocked; cp = bo->bo_private; sc = cp->geom->softc; @@ -182,9 +179,7 @@ g_vfs_strategy(struct bufobj *bo, struct buf *bp) mtx_unlock(&sc->sc_mtx); bp->b_error = ENXIO; bp->b_ioflags |= BIO_ERROR; - vfslocked = VFS_LOCK_GIANT(((struct mount *)NULL)); bufdone(bp); - VFS_UNLOCK_GIANT(vfslocked); return; } sc->sc_active++; @@ -234,7 +229,6 @@ g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr struct g_consumer *cp; struct g_vfs_softc *sc; struct bufobj *bo; - int vfslocked; int error; g_topology_assert(); @@ -259,9 +253,7 @@ g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr g_wither_geom(gp, ENXIO); return (error); } - vfslocked = VFS_LOCK_GIANT(vp->v_mount); vnode_create_vobject(vp, pp->mediasize, curthread); - VFS_UNLOCK_GIANT(vfslocked); *cpp = cp; cp->private = vp; bo->bo_ops = g_vfs_bufops; |
