 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_mount.c,v 1.62 2017/05/17 12:45:03 hannken Exp $	*/
+/*	$NetBSD: vfs_mount.c,v 1.63 2017/05/24 09:52:59 hannken Exp $	*/
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.62 2017/05/17 12:45:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.63 2017/05/24 09:52:59 hannken Exp $");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 @@ -859,100 +859,74 @@ dounmount(struct mount *mp, int flags, s
 	/*
 	 * No unmount below layered mounts.
 	 */
 	mountlist_iterator_init(&iter);
 	while ((cmp = mountlist_iterator_next(iter)) != NULL) {
 		if (cmp->mnt_lower == mp) {
 			mountlist_iterator_destroy(iter);
 			return EBUSY;
+		}
+	}
 	mountlist_iterator_destroy(iter);
 	/*
 	 * XXX Freeze syncer.  Must do this before locking the
 	 * mount point.  See dounmount() for details.
 	 */
 	mutex_enter(&syncer_mutex);
 	error = vfs_suspend(mp, 0);
 	if (error) {
 		mutex_exit(&syncer_mutex);
 		return error;
+	}
 	/*
 	 * Abort unmount attempt when the filesystem is in use
 	 */
 	mutex_enter(&mp->mnt_unmounting);
 	if (mp->mnt_busynest != 0) {
 		mutex_exit(&mp->mnt_unmounting);
 		mutex_exit(&syncer_mutex);
 		vfs_resume(mp);
 		return EBUSY;
+	}
 	/*
 	 * Abort unmount attempt when the filesystem is not mounted
 	 */
 	if ((mp->mnt_iflag & IMNT_GONE) != 0) {
 		mutex_exit(&mp->mnt_unmounting);
 		mutex_exit(&syncer_mutex);
 		return ENOENT;
+	}
 	used_syncer = (mp->mnt_iflag & IMNT_ONWORKLIST) != 0;
 	used_extattr = mp->mnt_flag & MNT_EXTATTR;
 	/*
 	 * XXX Syncer must be frozen when we get here.  This should really
 	 * be done on a per-mountpoint basis, but the syncer doesn't work
 	 * like that.
 	 * The caller of dounmount() must acquire syncer_mutex because
 	 * the syncer itself acquires locks in syncer_mutex -> vfs_busy
 	 * order, and we must preserve that order to avoid deadlock.
 	 * So, if the file system did not use the syncer, now is
 	 * the time to release the syncer_mutex.
 	 */
 	if (used_syncer == 0) {
 		mutex_exit(&syncer_mutex);
 	mp->mnt_iflag |= IMNT_UNMOUNT;
 	mutex_enter(&mp->mnt_updating);
 	async = mp->mnt_flag & MNT_ASYNC;
 	mp->mnt_flag &= ~MNT_ASYNC;
 	cache_purgevfs(mp);	/* remove cache entries for this file sys */
 	if (used_syncer)
 		vfs_syncer_remove_from_worklist(mp);
 	error = 0;
 	if (((mp->mnt_flag & MNT_RDONLY) == 0) && ((flags & MNT_FORCE) == 0)) {
 		error = VFS_SYNC(mp, MNT_WAIT, l->l_cred);
+	}
 	if (error == 0 || (flags & MNT_FORCE)) {
 		error = VFS_UNMOUNT(mp, flags);
+	}
 	if (error) {
 		mp->mnt_iflag &= ~IMNT_UNMOUNT;
 		mutex_exit(&mp->mnt_unmounting);
 		if ((mp->mnt_flag & (MNT_RDONLY | MNT_ASYNC)) == 0)
 			vfs_syncer_add_to_worklist(mp);
 		mp->mnt_flag |= async;
 		mutex_exit(&mp->mnt_updating);
 		vfs_resume(mp);
 		if (used_syncer)
 			mutex_exit(&syncer_mutex);
 		if (used_extattr) {
 			if (start_extattr(mp) != 0)
 				mp->mnt_flag &= ~MNT_EXTATTR;
 			else
 				mp->mnt_flag |= MNT_EXTATTR;
+		}
 		return (error);
+	}
 	mutex_exit(&mp->mnt_updating);
 	/*
 	 * release mnt_umounting lock here, because other code calls
 	 * vfs_busy() while holding the mountlist_lock.
 @@ -963,28 +937,26 @@ dounmount(struct mount *mp, int flags, s
 	 */
 	mp->mnt_iflag |= IMNT_GONE;
 	mutex_exit(&mp->mnt_unmounting);
 	vfs_resume(mp);
 	if ((coveredvp = mp->mnt_vnodecovered) != NULLVP) {
 		vn_lock(coveredvp, LK_EXCLUSIVE | LK_RETRY);
 		coveredvp->v_mountedhere = NULL;
 		VOP_UNLOCK(coveredvp);
+	}
 	mountlist_remove(mp);
 	if (TAILQ_FIRST(&mp->mnt_vnodelist) != NULL)
 		panic("unmount: dangling vnode");
 	if (used_syncer)
 		mutex_exit(&syncer_mutex);
 	vfs_hooks_unmount(mp);
 	fstrans_unmount(mp);
 	vfs_rele(mp);	/* reference from mount() */
 	if (coveredvp != NULLVP) {
 		vrele(coveredvp);
+	}
 	return (0);
+}
 /*
  * Unmount all file systems.
  * We traverse the list in reverse order under the assumption that doing so

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_subr.c,v 1.464 2017/05/07 08:26:58 hannken Exp $	*/
+/*	$NetBSD: vfs_subr.c,v 1.465 2017/05/24 09:52:59 hannken Exp $	*/
 /*-
  * Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, by Andrew Doran,
  * by Marshall Kirk McKusick and Greg Ganger at the University of Michigan.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -58,27 +58,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.464 2017/05/07 08:26:58 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.465 2017/05/24 09:52:59 hannken Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_43.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/dirent.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 @@ -558,49 +558,47 @@ typedef TAILQ_HEAD(synclist, vnode_impl)
 static void	vn_syncer_add1(struct vnode *, int);
 static void	sysctl_vfs_syncfs_setup(struct sysctllog **);
 /*
  * Defines and variables for the syncer process.
  */
 int syncer_maxdelay = SYNCER_MAXDELAY;	/* maximum delay time */
 time_t syncdelay = 30;			/* max time to delay syncing data */
 time_t filedelay = 30;			/* time to delay syncing files */
 time_t dirdelay  = 15;			/* time to delay syncing directories */
 time_t metadelay = 10;			/* time to delay syncing metadata */
 time_t lockdelay = 1;			/* time to delay if locking fails */
 kmutex_t		syncer_mutex;	/* used to freeze syncer, long term */
 static kmutex_t		syncer_data_lock; /* short term lock on data structs */
 static int		syncer_delayno = 0;
 static long		syncer_last;
 static synclist_t *	syncer_workitem_pending;
 static void
 vn_initialize_syncerd(void)
+{
 	int i;
 	syncer_last = SYNCER_MAXDELAY + 2;
 	sysctl_vfs_syncfs_setup(NULL);
 	syncer_workitem_pending =
 	    kmem_alloc(syncer_last * sizeof (struct synclist), KM_SLEEP);
 	for (i = 0; i < syncer_last; i++)
 		TAILQ_INIT(&syncer_workitem_pending[i]);
 	mutex_init(&syncer_mutex, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&syncer_data_lock, MUTEX_DEFAULT, IPL_NONE);
+}
 /*
  * Return delay factor appropriate for the given file system.   For
  * WAPBL we use the sync vnode to burst out metadata updates: sync
  * those file systems more frequently.
  */
 static inline int
 sync_delay(struct mount *mp)
+{
 	return mp->mnt_wapbl != NULL ? metadelay : syncdelay;
 @@ -757,28 +755,26 @@ lazy_sync_vnode(struct vnode *vp)
  * System filesystem synchronizer daemon.
  */
 void
 sched_sync(void *arg)
+{
 	mount_iterator_t *iter;
 	synclist_t *slp;
 	struct vnode *vp;
 	struct mount *mp;
 	time_t starttime;
 	bool synced;
 	for (;;) {
 		mutex_enter(&syncer_mutex);
 		starttime = time_second;
 		/*
 		 * Sync mounts whose dirty time has expired.
 		 */
 		mountlist_iterator_init(&iter);
 		while ((mp = mountlist_iterator_trynext(iter)) != NULL) {
 			if ((mp->mnt_iflag & IMNT_ONWORKLIST) == 0 ||
 			    mp->mnt_synclist_slot != syncer_delayno) {
 				continue;
+			}
 			mp->mnt_synclist_slot = sync_delay_slot(sync_delay(mp));
 			VFS_SYNC(mp, MNT_LAZY, curlwp->l_cred);
 @@ -820,27 +816,26 @@ sched_sync(void *arg)
 				 * syncdelay is mainly to get this vnode out
 				 * of the way so we do not consider it again
 				 * "soon" in this loop, so the delay time is
 				 * not critical as long as it is not "soon".
 				 * While write-back strategy is the file
 				 * system's domain, we expect write-back to
 				 * occur no later than syncdelay seconds
 				 * into the future.
 				 */
 				vn_syncer_add1(vp,
 				    synced ? syncdelay : lockdelay);
+			}
+		}
 		mutex_exit(&syncer_mutex);
 		/*
 		 * If it has taken us less than a second to process the
 		 * current work, then wait.  Otherwise start right over
 		 * again.  We can still lose time if any single round
 		 * takes more than two seconds, but it does not really
 		 * matter as we are just trying to generally pace the
 		 * filesystem activity.
 		 */
 		if (time_second == starttime) {
 			kpause("syncer", false, hz, &syncer_data_lock);
+		}
 		mutex_exit(&syncer_data_lock);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.h,v 1.226 2017/04/17 08:34:27 hannken Exp $	*/
+/*	$NetBSD: mount.h,v 1.227 2017/05/24 09:52:59 hannken Exp $	*/
 /*
  * Copyright (c) 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -448,27 +448,26 @@ int	vfs_quotactl_cursorget(struct mount
 int	vfs_quotactl_cursoratend(struct mount *, struct quotakcursor *, int *);
 int	vfs_quotactl_cursorrewind(struct mount *, struct quotakcursor *);
 int	vfs_quotactl_quotaon(struct mount *, int, const char *);
 int	vfs_quotactl_quotaoff(struct mount *, int);
 struct vnode_iterator; /* Opaque. */
 void	vfs_vnode_iterator_init(struct mount *, struct vnode_iterator **);
 void	vfs_vnode_iterator_destroy(struct vnode_iterator *);
 struct vnode *vfs_vnode_iterator_next(struct vnode_iterator *,
     bool (*)(void *, struct vnode *), void *);
 /* Syncer */
 extern int	syncer_maxdelay;
 extern kmutex_t	syncer_mutex;
 extern time_t	syncdelay;
 extern time_t	filedelay;
 extern time_t	dirdelay;
 extern time_t	metadelay;
 void	vfs_syncer_add_to_worklist(struct mount *);
 void	vfs_syncer_remove_from_worklist(struct mount *);
 extern	struct vfsops *vfssw[];			/* filesystem type table */
 extern	int nvfssw;
 extern	kmutex_t vfs_list_lock;
 void	vfs_mount_sysinit(void);
 long	makefstype(const char *);