svn commit: r198855 - head/sys/vm

[Alan Cox]

Author: alc
Date: Tue Nov  3 17:15:15 2009
New Revision: 198855
URL: http://svn.freebsd.org/changeset/base/198855

Log:
  Eliminate a bit of hackery from vm_fault().  The operations that this
  hackery sought to prevent are now properly supported by vm_map_protect().
  (See r198505.)
  
  Reviewed by:	kib

Modified:
  head/sys/vm/vm_fault.c

Modified: head/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Tue Nov  3 16:46:52 2009	(r198854)
+++ head/sys/vm/vm_fault.c	Tue Nov  3 17:15:15 2009	(r198855)
@@ -264,17 +264,6 @@ RetryFault:;
 			&fs.entry, &fs.first_object, &fs.first_pindex, &prot, &wired);
 		if (result != KERN_SUCCESS)
 			return (result);
-
-		/*
-		 * If we don't COW now, on a user wire, the user will never
-		 * be able to write to the mapping.  If we don't make this
-		 * restriction, the bookkeeping would be nearly impossible.
-		 *
-		 * XXX The following assignment modifies the map without
-		 * holding a write lock on it.
-		 */
-		if ((fs.entry->protection & VM_PROT_WRITE) == 0)
-			fs.entry->max_protection &= ~VM_PROT_WRITE;
 	}
 
 	map_generation = fs.map->timestamp;