svn commit: r195631 - head/sys/nfs

[Marcel Moolenaar]

Author: marcel
Date: Sun Jul 12 03:53:52 2009
New Revision: 195631
URL: http://svn.freebsd.org/changeset/base/195631

Log:
  Revert rev 192323 (nfs_common.c only):
  The D-cache flushing added here was to deal with I-cache
  incoherency observed on ia64. However, the problem was
  in the implementation of pmap_enter_object() for ia64:
  it was missing I-cache coherency logic for prefaulted
  pages. After this got added in rev 195625, testing showed
  that no D-cache flushing was required.
  
  The SIGILL that was observed on Book-E (see commit log
  for rev 192323) ended up not being related to I-cache
  incoherency, but was found to be caused by bad memory.
  This discovery further undermined the need for D-cache
  flushing in the NFS I/O code, triggering the reversal.
  
  Approved by:	re (kensmith)

Modified:
  head/sys/nfs/nfs_common.c

Modified: head/sys/nfs/nfs_common.c
==============================================================================
--- head/sys/nfs/nfs_common.c	Sun Jul 12 03:19:25 2009	(r195630)
+++ head/sys/nfs/nfs_common.c	Sun Jul 12 03:53:52 2009	(r195631)
@@ -126,10 +126,9 @@ nfsm_mbuftouio(struct mbuf **mrep, struc
 				(mbufcp, uiocp, xfer);
 			else
 #endif
-			if (uiop->uio_segflg == UIO_SYSSPACE) {
+			if (uiop->uio_segflg == UIO_SYSSPACE)
 				bcopy(mbufcp, uiocp, xfer);
-				cpu_flush_dcache(uiocp, xfer);
-			} else
+			else
 				copyout(mbufcp, uiocp, xfer);
 			left -= xfer;
 			len -= xfer;