Drag another softupdates tentacle back into FFS: Now that FFS's

vop_fsync is separate from the internal use we can do the full job
there.

2 files changed, 7 insertions, 2 deletions

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index a9f13104c697..55c303521b83 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -987,7 +987,6 @@ softdep_initialize()
 
 	/* hooks through which the main kernel code calls us */
 	softdep_process_worklist_hook = softdep_process_worklist;
-	softdep_fsync_hook = softdep_fsync;
 
 	/* initialise bioops hack */
 	bioops.io_start = softdep_disk_io_initiation;
@@ -1006,7 +1005,6 @@ softdep_uninitialize()
 {
 
 	softdep_process_worklist_hook = NULL;
-	softdep_fsync_hook = NULL;
 	hashdestroy(pagedep_hashtbl, M_PAGEDEP, pagedep_hash);
 	hashdestroy(inodedep_hashtbl, M_INODEDEP, inodedep_hash);
 	hashdestroy(newblk_hashtbl, M_NEWBLK, newblk_hash);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index c800cb5e8ed0..942a7e2c5fc4 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -160,6 +160,13 @@ ffs_fsync(struct vop_fsync_args *ap)
 	int error;
 
 	error = ffs_syncvnode(ap->a_vp, ap->a_waitfor);
+#ifdef SOFTUPDATES
+	if (error)
+		return (error);
+	if (ap->a_waitfor == MNT_WAIT &&
+	    (ap->a_vp->v_mount->mnt_flag & MNT_SOFTDEP))
+		error = softdep_fsync(ap->a_vp);
+#endif
 	return (error);
 }