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 /module/zfs/dmu_diff.c | |
| 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 'module/zfs/dmu_diff.c')
| -rw-r--r-- | module/zfs/dmu_diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/dmu_diff.c b/module/zfs/dmu_diff.c index a2130b131..30fabbb07 100644 --- a/module/zfs/dmu_diff.c +++ b/module/zfs/dmu_diff.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. */ #include <sys/dmu.h> @@ -107,7 +107,7 @@ report_dnode(struct diffarg *da, uint64_t object, dnode_phys_t *dnp) /* ARGSUSED */ static int diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, - const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg) + const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg) { struct diffarg *da = arg; int err = 0; |