diff options
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/refcount.h | 2 | ||||
| -rw-r--r-- | include/sys/zfs_znode.h | 2 | ||||
| -rw-r--r-- | include/sys/zil.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/sys/refcount.h b/include/sys/refcount.h index a96220b29..02002ec2f 100644 --- a/include/sys/refcount.h +++ b/include/sys/refcount.h @@ -39,7 +39,7 @@ extern "C" { * particular object, use FTAG (which is a string) for the holder_tag. * Otherwise, use the object that holds the reference. */ -#define FTAG ((char *)__func__) +#define FTAG ((char *)(uintptr_t)__func__) /* * Starting with 4.11, torvalds/linux@f405df5, the linux kernel defines a diff --git a/include/sys/zfs_znode.h b/include/sys/zfs_znode.h index c292f0373..6a3a3b233 100644 --- a/include/sys/zfs_znode.h +++ b/include/sys/zfs_znode.h @@ -352,7 +352,7 @@ extern void zfs_unmap_page(page_t *, caddr_t); #endif /* HAVE_UIO_RW */ extern zil_get_data_t zfs_get_data; -extern zil_replay_func_t zfs_replay_vector[TX_MAX_TYPE]; +extern zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE]; extern int zfsfstype; #endif /* _KERNEL */ diff --git a/include/sys/zil.h b/include/sys/zil.h index 291728a9d..11c7fb4a2 100644 --- a/include/sys/zil.h +++ b/include/sys/zil.h @@ -463,7 +463,7 @@ typedef int zil_parse_blk_func_t(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t txg); typedef int zil_parse_lr_func_t(zilog_t *zilog, lr_t *lr, void *arg, uint64_t txg); -typedef int (*const zil_replay_func_t)(void *, char *, boolean_t); +typedef int zil_replay_func_t(void *arg1, void *arg2, boolean_t byteswap); typedef int zil_get_data_t(void *arg, lr_write_t *lr, char *dbuf, zio_t *zio); extern int zil_parse(zilog_t *zilog, zil_parse_blk_func_t *parse_blk_func, @@ -480,7 +480,7 @@ extern zilog_t *zil_open(objset_t *os, zil_get_data_t *get_data); extern void zil_close(zilog_t *zilog); extern void zil_replay(objset_t *os, void *arg, - zil_replay_func_t replay_func[TX_MAX_TYPE]); + zil_replay_func_t *replay_func[TX_MAX_TYPE]); extern boolean_t zil_replaying(zilog_t *zilog, dmu_tx_t *tx); extern void zil_destroy(zilog_t *zilog, boolean_t keep_first); extern void zil_destroy_sync(zilog_t *zilog, dmu_tx_t *tx); |