From: Richard Yao <ryao@gentoo.org>
Date: Mon, 2 Sep 2013 04:22:30 +0000 (-0400)
Subject: Reintroduce uio_prefaultpages()
X-Git-Tag: zfs-0.6.3~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cac042cfeccb2d3ecc5a96c0c2ba9afe631338b;p=zfs

Reintroduce uio_prefaultpages()

This was accidentally removed by overzealous commenting.

Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1775
---

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.