svn commit: r185210 - in stable/7/sys: . modules/cxgb vm

[Konstantin Belousov]

Author: kib
Date: Sun Nov 23 16:08:36 2008
New Revision: 185210
URL: http://svn.freebsd.org/changeset/base/185210

Log:
  MFC r185012:
  Instead of forcing vn_start_write() to reset mp back to NULL for the
  failed calls with non-NULL vp, explicitely clear mp after failure.
  
  Approved by:	re (kensmith)
  PR:	123768

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/modules/cxgb/   (props changed)
  stable/7/sys/vm/vm_pageout.c

Modified: stable/7/sys/vm/vm_pageout.c
==============================================================================
--- stable/7/sys/vm/vm_pageout.c	Sun Nov 23 16:06:41 2008	(r185209)
+++ stable/7/sys/vm/vm_pageout.c	Sun Nov 23 16:08:36 2008	(r185210)
@@ -947,8 +947,7 @@ rescan0:
 				vp = object->handle;
 				if (vp->v_type == VREG &&
 				    vn_start_write(vp, &mp, V_NOWAIT) != 0) {
-					KASSERT(mp == NULL,
-					    ("vm_pageout_scan: mp != NULL"));
+					mp = NULL;
 					++pageout_lock_miss;
 					if (object->flags & OBJ_MIGHTBEDIRTY)
 						vnodes_skipped++;