diff --git a/module/zfs/spa.c b/module/zfs/spa.c index eb35077356..f492f24901 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -113,7 +113,7 @@ const zio_taskq_info_t zio_taskqs[ZIO_TYPES][ZIO_TASKQ_TYPES] = { static dsl_syncfunc_t spa_sync_props; static boolean_t spa_has_active_shared_spare(spa_t *spa); -static int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config, +static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config, spa_load_state_t state, spa_import_type_t type, boolean_t mosconfig, char **ereport); diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 46588922dc..4f95d24191 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1122,8 +1122,7 @@ zio_interrupt(zio_t *zio) */ static zio_pipe_stage_t *zio_pipeline[]; -__attribute__((always_inline)) -inline void +void zio_execute(zio_t *zio) { zio->io_executor = curthread;