diff options
| author | Brian Behlendorf <[email protected]> | 2009-02-18 13:09:32 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-18 13:09:32 -0800 |
| commit | 3b17164f715e3c0cd5205f2e001dc4ad1398f658 (patch) | |
| tree | e53af59bc8333a17bd16447ac89a6709c594f92e /module/zfs/vdev_label.c | |
| parent | 5c625d7d8aa06604c709e160085d277376a29fce (diff) | |
| parent | d164b2093561a9771db07346e6fffc9ca19427a2 (diff) | |
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
Conflicts:
module/zfs/vdev.c
module/zfs/zio.c
Diffstat (limited to 'module/zfs/vdev_label.c')
| -rw-r--r-- | module/zfs/vdev_label.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c index 46dcf19ae..e6cd5ef0a 100644 --- a/module/zfs/vdev_label.c +++ b/module/zfs/vdev_label.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -966,7 +966,7 @@ vdev_label_sync_list(spa_t *spa, int l, uint64_t txg, int flags) for (vd = list_head(dl); vd != NULL; vd = list_next(dl, vd)) { uint64_t *good_writes = kmem_zalloc(sizeof (uint64_t), KM_SLEEP); - zio_t *vio = zio_null(zio, spa, + zio_t *vio = zio_null(zio, spa, NULL, (vd->vdev_islog || vd->vdev_aux != NULL) ? vdev_label_sync_ignore_done : vdev_label_sync_top_done, good_writes, flags); |