svn commit: r252004 - user/attilio/vmobj-readlock/sys/fs/tmpfs

[Attilio Rao]

Author: attilio
Date: Wed Jun 19 20:07:56 2013
New Revision: 252004
URL: http://svnweb.freebsd.org/changeset/base/252004

Log:
  kern_sendfile() doesn't sbusy the page any longer, so remove a "nomore"
  relevant piece of code.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c

Modified: user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c	Wed Jun 19 19:44:57 2013	(r252003)
+++ user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_vnops.c	Wed Jun 19 20:07:56 2013	(r252004)
@@ -448,11 +448,6 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
 	VM_OBJECT_WLOCK(tobj);
 
 	/*
-	 * The kern_sendfile() code calls vn_rdwr() with the page
-	 * soft-busied.  Ignore the soft-busy state here. Parallel
-	 * reads of the page content from disk are prevented by
-	 * VPO_BUSY.
-	 *
 	 * Although the tmpfs vnode lock is held here, it is
 	 * nonetheless safe to sleep waiting for a free page.  The
 	 * pageout daemon does not need to acquire the tmpfs vnode
@@ -460,7 +455,7 @@ tmpfs_nocacheread(vm_object_t tobj, vm_p
 	 * type object.
 	 */
 	m = vm_page_grab(tobj, idx, VM_ALLOC_NORMAL | VM_ALLOC_RETRY |
-	    VM_ALLOC_IGN_SBUSY | VM_ALLOC_NOBUSY);
+	    VM_ALLOC_NOBUSY);
 	if (m->valid != VM_PAGE_BITS_ALL) {
 		vm_page_busy(m);
 		if (vm_pager_has_page(tobj, idx, NULL, NULL)) {