aboutsummaryrefslogtreecommitdiff
path: root/sys/fs
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2016-05-22 18:16:25 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2016-05-22 18:16:25 +0000
commitdf5905fe7db95bb3e7e4e64ebf98fabf6c474527 (patch)
tree0b9fcc4bc1fa497c8d678cfce126f5474219197f /sys/fs
parent595568b58bfb90e9aabc61e0ce998bbfcd5e0810 (diff)
Notes
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/cd9660/cd9660_vfsops.c6
-rw-r--r--sys/fs/udf/udf_vfsops.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 649b01adb83f..a55846403316 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -226,11 +226,9 @@ iso_mountfs(devvp, mp)
dev = devvp->v_rdev;
dev_ref(dev);
- DROP_GIANT();
g_topology_lock();
error = g_vfs_open(devvp, &cp, "cd9660", 0);
g_topology_unlock();
- PICKUP_GIANT();
VOP_UNLOCK(devvp, 0);
if (error)
goto out;
@@ -481,11 +479,9 @@ out:
if (supbp != NULL)
brelse(supbp);
if (cp != NULL) {
- DROP_GIANT();
g_topology_lock();
g_vfs_close(cp);
g_topology_unlock();
- PICKUP_GIANT();
}
if (isomp) {
free(isomp, M_ISOFSMNT);
@@ -519,11 +515,9 @@ cd9660_unmount(mp, mntflags)
if (isomp->im_l2d)
cd9660_iconv->close(isomp->im_l2d);
}
- DROP_GIANT();
g_topology_lock();
g_vfs_close(isomp->im_cp);
g_topology_unlock();
- PICKUP_GIANT();
vrele(isomp->im_devvp);
dev_rel(isomp->im_dev);
free(isomp, M_ISOFSMNT);
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index 8c44f483da62..a2fcac7bcdc2 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -325,11 +325,9 @@ udf_mountfs(struct vnode *devvp, struct mount *mp)
dev = devvp->v_rdev;
dev_ref(dev);
- DROP_GIANT();
g_topology_lock();
error = g_vfs_open(devvp, &cp, "udf", 0);
g_topology_unlock();
- PICKUP_GIANT();
VOP_UNLOCK(devvp, 0);
if (error)
goto bail;
@@ -500,11 +498,9 @@ bail:
if (bp != NULL)
brelse(bp);
if (cp != NULL) {
- DROP_GIANT();
g_topology_lock();
g_vfs_close(cp);
g_topology_unlock();
- PICKUP_GIANT();
}
dev_rel(dev);
return error;
@@ -533,11 +529,9 @@ udf_unmount(struct mount *mp, int mntflags)
#endif
}
- DROP_GIANT();
g_topology_lock();
g_vfs_close(udfmp->im_cp);
g_topology_unlock();
- PICKUP_GIANT();
vrele(udfmp->im_devvp);
dev_rel(udfmp->im_dev);