[src/trunk]: src/sys/ufs/ext2fs Change ext2fs_sync() to use vfs_vnode_iterator.

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b85cdcbe6cd7
branches:  trunk
changeset: 327801:b85cdcbe6cd7
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Mar 17 09:30:32 2014 +0000

description:
Change ext2fs_sync() to use vfs_vnode_iterator.

diffstat:

 sys/ufs/ext2fs/ext2fs_vfsops.c |  58 +++++++++++++++--------------------------
 1 files changed, 22 insertions(+), 36 deletions(-)

diffs (104 lines):

diff -r d51c4c67d4e9 -r b85cdcbe6cd7 sys/ufs/ext2fs/ext2fs_vfsops.c
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c    Mon Mar 17 09:29:55 2014 +0000
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c    Mon Mar 17 09:30:32 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_vfsops.c,v 1.177 2014/03/05 09:37:29 hannken Exp $      */
+/*     $NetBSD: ext2fs_vfsops.c,v 1.178 2014/03/17 09:30:32 hannken Exp $      */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.177 2014/03/05 09:37:29 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.178 2014/03/17 09:30:32 hannken Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -871,10 +871,11 @@
 int
 ext2fs_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
 {
-       struct vnode *vp, *mvp;
+       struct vnode *vp;
        struct inode *ip;
        struct ufsmount *ump = VFSTOUFS(mp);
        struct m_ext2fs *fs;
+       struct vnode_iterator *marker;
        int error, allerror = 0;
 
        fs = ump->um_e2fs;
@@ -883,43 +884,30 @@
                panic("update: rofs mod");
        }
 
-       /* Allocate a marker vnode. */
-       mvp = vnalloc(mp);
-
        /*
         * Write back each (modified) inode.
         */
-       mutex_enter(&mntvnode_lock);
-loop:
-       /*
-        * NOTE: not using the TAILQ_FOREACH here since in this loop vgone()
-        * and vclean() can be called indirectly
-        */
-       for (vp = TAILQ_FIRST(&mp->mnt_vnodelist); vp; vp = vunmark(mvp)) {
-               vmark(mvp, vp);
-               if (vp->v_mount != mp || vismarker(vp))
+       vfs_vnode_iterator_init(mp, &marker);
+       while (vfs_vnode_iterator_next(marker, &vp)) {
+               error = vn_lock(vp, LK_EXCLUSIVE);
+               if (error) {
+                       vrele(vp);
                        continue;
-               mutex_enter(vp->v_interlock);
+               }
                ip = VTOI(vp);
-               if (ip == NULL || (vp->v_iflag & (VI_XLOCK|VI_CLEAN)) != 0 ||
-                   vp->v_type == VNON ||
-                   ((ip->i_flag &
+               /*
+                * Skip the vnode/inode if inaccessible.
+                */
+               if (ip == NULL || vp->v_type == VNON) {
+                       vput(vp);
+                       continue;
+               }
+
+               if (((ip->i_flag &
                      (IN_CHANGE | IN_UPDATE | IN_MODIFIED)) == 0 &&
                     LIST_EMPTY(&vp->v_dirtyblkhd) &&
-                    UVM_OBJ_IS_CLEAN(&vp->v_uobj)))
-               {
-                       mutex_exit(vp->v_interlock);
-                       continue;
-               }
-               mutex_exit(&mntvnode_lock);
-               error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
-               if (error) {
-                       mutex_enter(&mntvnode_lock);
-                       if (error == ENOENT) {
-                               mutex_enter(&mntvnode_lock);
-                               (void)vunmark(mvp);
-                               goto loop;
-                       }
+                    UVM_OBJ_IS_CLEAN(&vp->v_uobj))) {
+                       vput(vp);
                        continue;
                }
                if (vp->v_type == VREG && waitfor == MNT_LAZY)
@@ -930,10 +918,8 @@
                if (error)
                        allerror = error;
                vput(vp);
-               mutex_enter(&mntvnode_lock);
        }
-       mutex_exit(&mntvnode_lock);
-       vnfree(mvp);
+       vfs_vnode_iterator_destroy(marker);
        /*
         * Force stale file system control information to be flushed.
         */