Linux 4.12 compat: PF_FSTRANS was removed

zfsonlinux/spl@8f87971 added __spl_pf_fstrans_check for the xfs related
check, so we use them accordingly.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Chunwei Chen <david.chen@osnexus.com>
Closes #6113

diff --git a/include/sys/zfs_context.h b/include/sys/zfs_context.h
index b4f63e19c40f676eee98c57090e74052f23eccfd..6163b2fbfb7c0e417d6ed6be088ac52f52417d0e 100644 (file)
--- a/include/sys/zfs_context.h
+++ b/include/sys/zfs_context.h
@@ -799,7 +799,7 @@ typedef int fstrans_cookie_t;
 
 extern fstrans_cookie_t spl_fstrans_mark(void);
 extern void spl_fstrans_unmark(fstrans_cookie_t);
-extern int spl_fstrans_check(void);
+extern int __spl_pf_fstrans_check(void);
 
 #endif /* _KERNEL */
 #endif /* _SYS_ZFS_CONTEXT_H */

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index 40b96dabaff4dab2f27b2ce2ba3d33f3f92334b3..ed9c1a9ef7d5d1a1e7d955b12b19341205444081 100644 (file)
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -1500,7 +1500,7 @@ spl_fstrans_unmark(fstrans_cookie_t cookie)
 }
 
 int
-spl_fstrans_check(void)
+__spl_pf_fstrans_check(void)
 {
        return (0);
 }

diff --git a/module/zfs/vdev_file.c b/module/zfs/vdev_file.c
index 54a50c318fe803142125fd2e82642d1a7eea91a6..c5e64520d3c181a0d9263510d52467cc66756f3b 100644 (file)
--- a/module/zfs/vdev_file.c
+++ b/module/zfs/vdev_file.c
@@ -213,7 +213,7 @@ vdev_file_io_start(zio_t *zio)
                         * already set, see xfs_vm_writepage().  Therefore
                         * the sync must be dispatched to a different context.
                         */
-                       if (spl_fstrans_check()) {
+                       if (__spl_pf_fstrans_check()) {
                                VERIFY3U(taskq_dispatch(vdev_file_taskq,
                                    vdev_file_io_fsync, zio, TQ_SLEEP), !=,
                                    TASKQID_INVALID);