summaryrefslogtreecommitdiffstats
path: root/sys/ufs/ffs/ffs_vfsops.c
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2013-01-11 06:08:32 +0000
committerkib <kib@FreeBSD.org>2013-01-11 06:08:32 +0000
commita1f936063858480a77fe8f64f01327df23336842 (patch)
tree3f32e9ce443052d57af1de00bcd5edf06395f8f8 /sys/ufs/ffs/ffs_vfsops.c
parent6e25165637bf61f063228720a36b367f5c38bf69 (diff)
downloadFreeBSD-src-a1f936063858480a77fe8f64f01327df23336842.zip
FreeBSD-src-a1f936063858480a77fe8f64f01327df23336842.tar.gz
Add flags argument to vfs_write_resume() and remove
vfs_write_resume_flags(). Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 83ae202..0204613 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -292,7 +292,7 @@ ffs_mount(struct mount *mp)
error = ffs_flushfiles(mp, flags, td);
}
if (error) {
- vfs_write_resume(mp);
+ vfs_write_resume(mp, 0);
return (error);
}
if (fs->fs_pendingblocks != 0 ||
@@ -309,7 +309,7 @@ ffs_mount(struct mount *mp)
if ((error = ffs_sbupdate(ump, MNT_WAIT, 0)) != 0) {
fs->fs_ronly = 0;
fs->fs_clean = 0;
- vfs_write_resume(mp);
+ vfs_write_resume(mp, 0);
return (error);
}
if (MOUNTEDSOFTDEP(mp))
@@ -330,7 +330,7 @@ ffs_mount(struct mount *mp)
* Allow the writers to note that filesystem
* is ro now.
*/
- vfs_write_resume(mp);
+ vfs_write_resume(mp, 0);
}
if ((mp->mnt_flag & MNT_RELOAD) &&
(error = ffs_reload(mp, td, 0)) != 0)
@@ -1294,10 +1294,8 @@ ffs_unmount(mp, mntflags)
goto fail;
}
}
- if (susp) {
- vfs_write_resume(mp);
- vn_start_write(NULL, &mp, V_WAIT);
- }
+ if (susp)
+ vfs_write_resume(mp, VR_START_WRITE);
DROP_GIANT();
g_topology_lock();
if (ump->um_fsckpid > 0) {
@@ -1329,10 +1327,8 @@ ffs_unmount(mp, mntflags)
return (error);
fail:
- if (susp) {
- vfs_write_resume(mp);
- vn_start_write(NULL, &mp, V_WAIT);
- }
+ if (susp)
+ vfs_write_resume(mp, VR_START_WRITE);
#ifdef UFS_EXTATTR
if (e_restart) {
ufs_extattr_uepm_init(&ump->um_extattr);
OpenPOWER on IntegriCloud