Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem

2010-08-12 15:54:18 -07:00 · 2010-08-12 15:54:18 -07:00 · 3fb16111ea
parent bd86729c1e 2e26d243e2
commit 3fb16111ea
1 changed files with 1 additions and 1 deletions
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@ -1076,7 +1076,7 @@ zio_taskq_dispatch(zio_t *zio, enum zio_taskq_type q, boolean_t cutinline)
 	ASSERT3U(q, <, ZIO_TASKQ_TYPES);

 	while (taskq_dispatch(spa->spa_zio_taskq[t][q],
-	    (task_func_t *)__zio_execute, zio, flags) == 0); /* do nothing */
+	    (task_func_t *)zio_execute, zio, flags) == 0); /* do nothing */
 }

 static boolean_t