svn commit: r185012 - head/sys/vm

[Konstantin Belousov]

Author: kib
Date: Sun Nov 16 21:57:54 2008
New Revision: 185012
URL: http://svn.freebsd.org/changeset/base/185012

Log:
  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.
  
  Tested by:	stass
  Reviewed by:	tegge
  PR:		123768
  MFC after:	1 week

Modified:
  head/sys/vm/vm_pageout.c

Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Sun Nov 16 21:56:29 2008	(r185011)
+++ head/sys/vm/vm_pageout.c	Sun Nov 16 21:57:54 2008	(r185012)
@@ -944,8 +944,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++;