Author: kib
Date: Wed Aug 29 15:56:13 2012
New Revision: 239850
URL: http://svn.freebsd.org/changeset/base/239850

Log:
  MFC r236322:
  Enable vn_io_fault() lock avoidance for UFS.

Modified:
  stable/9/sys/ufs/ffs/ffs_vfsops.c
  stable/9/sys/ufs/ffs/ffs_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vfsops.c   Wed Aug 29 15:55:54 2012        
(r239849)
+++ stable/9/sys/ufs/ffs/ffs_vfsops.c   Wed Aug 29 15:56:13 2012        
(r239850)
@@ -1064,7 +1064,7 @@ ffs_mountfs(devvp, mp, td)
         */
        MNT_ILOCK(mp);
        mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED |
-           MNTK_EXTENDED_SHARED;
+           MNTK_EXTENDED_SHARED | MNTK_NO_IOPF;
        MNT_IUNLOCK(mp);
 #ifdef UFS_EXTATTR
 #ifdef UFS_EXTATTR_AUTOSTART

Modified: stable/9/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_vnops.c    Wed Aug 29 15:55:54 2012        
(r239849)
+++ stable/9/sys/ufs/ffs/ffs_vnops.c    Wed Aug 29 15:56:13 2012        
(r239850)
@@ -567,7 +567,7 @@ ffs_read(ap)
                        xfersize = size;
                }
 
-               error = uiomove((char *)bp->b_data + blkoffset,
+               error = vn_io_fault_uiomove((char *)bp->b_data + blkoffset,
                    (int)xfersize, uio);
                if (error)
                        break;
@@ -738,8 +738,8 @@ ffs_write(ap)
                if (size < xfersize)
                        xfersize = size;
 
-               error =
-                   uiomove((char *)bp->b_data + blkoffset, (int)xfersize, uio);
+               error = vn_io_fault_uiomove((char *)bp->b_data + blkoffset,
+                   (int)xfersize, uio);
                /*
                 * If the buffer is not already filled and we encounter an
                 * error while trying to fill it, we have to clear out any
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to