c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Linux 4.12 compat: PF_FSTRANS was removed

Browse Source 
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
This commit is contained in:
Chunwei Chen 2017-05-09 10:38:46 -07:00 committed by Brian Behlendorf
parent a0e84010c9
commit e624cd1959
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zfs_context.h
View File

@ -799,7 +799,7 @@ typedef int fstrans_cookie_t;
extern fstrans_cookie_t spl_fstrans_mark(void); extern fstrans_cookie_t spl_fstrans_mark(void);
extern void spl_fstrans_unmark(fstrans_cookie_t); extern void spl_fstrans_unmark(fstrans_cookie_t);
extern int spl_fstrans_check(void); extern int __spl_pf_fstrans_check(void);
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* _SYS_ZFS_CONTEXT_H */ #endif /* _SYS_ZFS_CONTEXT_H */

2
lib/libzpool/kernel.c
View File

@ -1500,7 +1500,7 @@ spl_fstrans_unmark(fstrans_cookie_t cookie)
} }
int int
spl_fstrans_check(void) __spl_pf_fstrans_check(void)
{ {
return (0); return (0);
} }

2
module/zfs/vdev_file.c
View File

@ -213,7 +213,7 @@ vdev_file_io_start(zio_t *zio)
* already set, see xfs_vm_writepage(). Therefore * already set, see xfs_vm_writepage(). Therefore
* the sync must be dispatched to a different context. * the sync must be dispatched to a different context.
*/ */
if (spl_fstrans_check()) { if (__spl_pf_fstrans_check()) {
VERIFY3U(taskq_dispatch(vdev_file_taskq, VERIFY3U(taskq_dispatch(vdev_file_taskq,
vdev_file_io_fsync, zio, TQ_SLEEP), !=, vdev_file_io_fsync, zio, TQ_SLEEP), !=,
TASKQID_INVALID); TASKQID_INVALID);