diff options
| author | Brian Behlendorf <[email protected]> | 2009-02-18 16:36:25 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-18 16:36:25 -0800 |
| commit | 04f40450770e7a97c47ffcb769882e2908053ae5 (patch) | |
| tree | e797ce86eb57c1909f2cb9283e09f36b4a313e63 | |
| parent | beef42a45d59cb1bef6921b009ae95343bea0f61 (diff) | |
| parent | e898182f628c39b205d1eae0c0c3ea8261e465a4 (diff) | |
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
| -rw-r--r-- | module/zfs/zio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/module/zfs/zio.c b/module/zfs/zio.c index e42e31a07..46afab733 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -357,6 +357,7 @@ void zio_add_child(zio_t *pio, zio_t *cio) { zio_link_t *zl = kmem_cache_alloc(zio_link_cache, KM_SLEEP); + int w; /* * Logical I/Os can have logical, gang, or vdev children. @@ -374,7 +375,7 @@ zio_add_child(zio_t *pio, zio_t *cio) ASSERT(pio->io_state[ZIO_WAIT_DONE] == 0); - for (int w = 0; w < ZIO_WAIT_TYPES; w++) + for (w = 0; w < ZIO_WAIT_TYPES; w++) pio->io_children[cio->io_child_type][w] += !cio->io_state[w]; list_insert_head(&pio->io_child_list, zl); @@ -1157,7 +1158,7 @@ zio_reexecute(zio_t *pio) for (cio = zio_walk_children(pio); cio != NULL; cio = cio_next) { cio_next = zio_walk_children(pio); mutex_enter(&pio->io_lock); - for (int w = 0; w < ZIO_WAIT_TYPES; w++) + for (w = 0; w < ZIO_WAIT_TYPES; w++) pio->io_children[cio->io_child_type][w]++; mutex_exit(&pio->io_lock); zio_reexecute(cio); |