From 9cac042cfeccb2d3ecc5a96c0c2ba9afe631338b Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Mon, 2 Sep 2013 00:22:30 -0400 Subject: [PATCH] Reintroduce uio_prefaultpages() This was accidentally removed by overzealous commenting. Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Issue #1775 --- module/zfs/zfs_vnops.c | 4 ++-- 1 file 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. -- 2.40.0