Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-19 12:39:35 -08:00
commit 5444e131df
1 changed files with 2 additions and 1 deletions

View File

@ -909,8 +909,9 @@ zio_taskq_member(zio_t *zio, enum zio_taskq_type q)
{ {
kthread_t *executor = zio->io_executor; kthread_t *executor = zio->io_executor;
spa_t *spa = zio->io_spa; spa_t *spa = zio->io_spa;
zio_type_t t;
for (zio_type_t t = 0; t < ZIO_TYPES; t++) for (t = 0; t < ZIO_TYPES; t++)
if (taskq_member(spa->spa_zio_taskq[t][q], executor)) if (taskq_member(spa->spa_zio_taskq[t][q], executor))
return (B_TRUE); return (B_TRUE);