From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sat, 25 May 2019 20:42:09 +0000 (+0900)
Subject: Linux 5.2 compat: Directly call wait_on_page_bit()
X-Git-Tag: zfs-0.8.1~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2fb37bcadd08d5d7524a370765d926df2f2e18d9;p=zfs

Linux 5.2 compat: Directly call wait_on_page_bit()

wait_on_page_writeback() was made GPL only in torvalds/linux@19343b5bdd.

Directly call wait_on_page_bit() without using wait_on_page_writeback()
interface, given zfs_putpage() is the only caller for now.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@osnexus.com>
Closes #8794
---

diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c
index 41c1bd255..885d9633b 100644
--- a/module/zfs/zfs_vnops.c
+++ b/module/zfs/zfs_vnops.c
@@ -4526,8 +4526,10 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
 		unlock_page(pp);
 		rangelock_exit(lr);
 
-		if (wbc->sync_mode != WB_SYNC_NONE)
-			wait_on_page_writeback(pp);
+		if (wbc->sync_mode != WB_SYNC_NONE) {
+			if (PageWriteback(pp))
+				wait_on_page_bit(pp, PG_writeback);
+		}
 
 		ZFS_EXIT(zfsvfs);
 		return (0);