diff options
| author | Matthew Ahrens <[email protected]> | 2014-06-25 10:37:59 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-08-06 14:48:41 -0700 |
| commit | 5dbd68a352a04672c2f88654d1652cdf12f66708 (patch) | |
| tree | c175a67cab4f0b7a8996762110dbf2ae56ace79d /include/sys/spa.h | |
| parent | 1fa8f795d586208defe2ed499c691c5bc2e28eee (diff) | |
Illumos 4914 - zfs on-disk bookmark structure should be named *_phys_t
4914 zfs on-disk bookmark structure should be named *_phys_t
Reviewed by: George Wilson <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: Richard Lowe <[email protected]>
Reviewed by: Saso Kiselkov <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
References:
https://www.illumos.org/issues/4914
https://github.com/illumos/illumos-gate/commit/7802d7b
Porting notes:
There were a number of zfsonlinux-specific uses of zbookmark_t which
needed to be updated. This should reduce the likelihood of further
problems like issue #2094 from occurring.
Ported by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2558
Diffstat (limited to 'include/sys/spa.h')
| -rw-r--r-- | include/sys/spa.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sys/spa.h b/include/sys/spa.h index 707b1987a..cc9569255 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ @@ -51,7 +51,7 @@ typedef struct zilog zilog_t; typedef struct spa_aux_vdev spa_aux_vdev_t; typedef struct ddt ddt_t; typedef struct ddt_entry ddt_entry_t; -typedef struct zbookmark zbookmark_t; +typedef struct zbookmark_phys zbookmark_phys_t; struct dsl_pool; struct dsl_dataset; @@ -720,7 +720,7 @@ typedef enum txg_state { extern void spa_stats_init(spa_t *spa); extern void spa_stats_destroy(spa_t *spa); -extern void spa_read_history_add(spa_t *spa, const zbookmark_t *zb, +extern void spa_read_history_add(spa_t *spa, const zbookmark_phys_t *zb, uint32_t aflags); extern void spa_txg_history_add(spa_t *spa, uint64_t txg, hrtime_t birth_time); extern int spa_txg_history_set(spa_t *spa, uint64_t txg, @@ -842,7 +842,7 @@ extern void spa_history_log_internal_dd(dsl_dir_t *dd, const char *operation, dmu_tx_t *tx, const char *fmt, ...); /* error handling */ -struct zbookmark; +struct zbookmark_phys; extern void spa_log_error(spa_t *spa, zio_t *zio); extern void zfs_ereport_post(const char *class, spa_t *spa, vdev_t *vd, zio_t *zio, uint64_t stateoroffset, uint64_t length); |