Module Name: src
Committed By: riz
Date: Sat May 19 15:29:21 UTC 2012
Modified Files:
src/sys/kern [netbsd-6]: vfs_subr.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #267):
sys/kern/vfs_subr.c: revision 1.435
remove a bogus optimization introduced in the previous change.
fixes hangs in the rump/rumpvfs/t_etfs test.
To generate a diff of this commit:
cvs rdiff -u -r1.432.2.1 -r1.432.2.2 src/sys/kern/vfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.432.2.1 src/sys/kern/vfs_subr.c:1.432.2.2
--- src/sys/kern/vfs_subr.c:1.432.2.1 Mon May 7 03:01:13 2012
+++ src/sys/kern/vfs_subr.c Sat May 19 15:29:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.432.2.1 2012/05/07 03:01:13 riz Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.432.2.2 2012/05/19 15:29:21 riz Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.432.2.1 2012/05/07 03:01:13 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.432.2.2 2012/05/19 15:29:21 riz Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -290,9 +290,6 @@ vflushbuf(struct vnode *vp, int flags)
mutex_enter(vp->v_interlock);
(void) VOP_PUTPAGES(vp, 0, 0, pflags);
- if (LIST_EMPTY(&vp->v_dirtyblkhd) || (flags & FSYNC_DATAONLY))
- return 0;
-
loop:
mutex_enter(&bufcache_lock);
for (bp = LIST_FIRST(&vp->v_dirtyblkhd); bp; bp = nbp) {
