summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2013-09-02 00:22:30 -0400
committerBrian Behlendorf <[email protected]>2013-10-29 15:06:18 -0700
commit9cac042cfeccb2d3ecc5a96c0c2ba9afe631338b (patch)
tree385500447088aa1105dbe1af9338dba3d70981aa
parent023699cd62eb033ebed5e5fae4e13acaba4c5461 (diff)
Reintroduce uio_prefaultpages()
This was accidentally removed by overzealous commenting. Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Issue #1775
-rw-r--r--module/zfs/zfs_vnops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 423ca3800..5ff1fdee2 100644
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -650,18 +650,18 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
return (EAGAIN);
}
-#ifdef HAVE_UIO_ZEROCOPY
/*
* Pre-fault the pages to ensure slow (eg NFS) pages
* don't hold up txg.
* Skip this if uio contains loaned arc_buf.
*/
+#ifdef HAVE_UIO_ZEROCOPY
if ((uio->uio_extflg == UIO_XUIO) &&
(((xuio_t *)uio)->xu_type == UIOTYPE_ZEROCOPY))
xuio = (xuio_t *)uio;
else
+#endif
uio_prefaultpages(MIN(n, max_blksz), uio);
-#endif /* HAVE_UIO_ZEROCOPY */
/*
* If in append mode, set the io offset pointer to eof.