From 52c23142d4b2c0de86fe749eccbd3ae2727192db Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 2 Aug 2010 15:22:11 -0700 Subject: [PATCH 1/2] Revert "Inline zio_execute() to reduce stack use" This reverts commit 411dd65af1a3f931cee72adc6b9817187ae112cf. gcc version 4.1.2 does not like having differing prototypes for zio_execute, one version in the .c with inline and one version in the .h without. Thus I'm reverting this change and we'll see how critical this particular stack reduction is. --- module/zfs/zio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/zfs/zio.c b/module/zfs/zio.c index cf9b99e56f..75807bd30e 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1119,8 +1119,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; From 45c00bf359e9f08f300f45be9c31a5e190792ec5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 2 Aug 2010 15:24:33 -0700 Subject: [PATCH 2/2] Fix spa_load_impl() prototype Both the forward declaration of spa_load_impl() and the actual function declaration must match. --- module/zfs/spa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 9a8503e303..57c1ebb8a7 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);