summaryrefslogtreecommitdiffstats
path: root/sys/ufs/ffs
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2016-05-17 21:35:35 +0000
committerkib <kib@FreeBSD.org>2016-05-17 21:35:35 +0000
commit393eee329baabcf8c87884e89a4fef728ee42bdd (patch)
tree8370e5a8146a6cb8ddf760afb4007337d6a1e177 /sys/ufs/ffs
parent6c68797acfe0aea91e6566ed917636934e1a8c09 (diff)
downloadFreeBSD-src-393eee329baabcf8c87884e89a4fef728ee42bdd.zip
FreeBSD-src-393eee329baabcf8c87884e89a4fef728ee42bdd.tar.gz
Do enable io accounting for read-only mounts and mounts which are
remounted to writeable after initial read-only. Assign to dev->si_mountpt earlier to account the accesses done at the mount time. Based on submission by: bde MFC after: 1 week
Diffstat (limited to 'sys/ufs/ffs')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 9776554..712fc21 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -780,6 +780,8 @@ ffs_mountfs(devvp, mp, td)
mp->mnt_iosize_max = MAXPHYS;
devvp->v_bufobj.bo_ops = &ffs_ops;
+ if (devvp->v_type == VCHR)
+ devvp->v_rdev->si_mountpt = mp;
fs = NULL;
sblockloc = 0;
@@ -1049,8 +1051,6 @@ ffs_mountfs(devvp, mp, td)
ffs_flushfiles(mp, FORCECLOSE, td);
goto out;
}
- if (devvp->v_type == VCHR && devvp->v_rdev != NULL)
- devvp->v_rdev->si_mountpt = mp;
if (fs->fs_snapinum[0] != 0)
ffs_snapshot_mount(mp);
fs->fs_fmod = 1;
@@ -1083,6 +1083,8 @@ ffs_mountfs(devvp, mp, td)
out:
if (bp)
brelse(bp);
+ if (devvp->v_type == VCHR && devvp->v_rdev != NULL)
+ devvp->v_rdev->si_mountpt = NULL;
if (cp != NULL) {
DROP_GIANT();
g_topology_lock();
OpenPOWER on IntegriCloud