diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-12-06 00:50:57 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-12-06 00:50:57 +0000 |
| commit | 6d8516a342fd4449839522de5bf62108931ed4fe (patch) | |
| tree | f298de89f21263c8524fbc563eb8faa4f4fb54aa /uts/common/fs/zfs/dsl_bookmark.c | |
| parent | 323b8f9383837cdfbb15e62f7db3a1ffb4b106ed (diff) | |
| download | src-6d8516a342fd4449839522de5bf62108931ed4fe.tar.gz src-6d8516a342fd4449839522de5bf62108931ed4fe.zip | |
5314 Remove "dbuf phys" db->db_data pointer aliases in ZFS
Reviewed by: Andriy Gapon <avg@freebsd.org>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Will Andrews <willa@spectralogic.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Justin T. Gibbs <justing@spectralogic.com>
illumos/illumos-gate@c1379625401dfbe1c39b79136dd384a571d47fde
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=275551
Diffstat (limited to 'uts/common/fs/zfs/dsl_bookmark.c')
| -rw-r--r-- | uts/common/fs/zfs/dsl_bookmark.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/uts/common/fs/zfs/dsl_bookmark.c b/uts/common/fs/zfs/dsl_bookmark.c index 21784630da6b..5fb7f96600dc 100644 --- a/uts/common/fs/zfs/dsl_bookmark.c +++ b/uts/common/fs/zfs/dsl_bookmark.c @@ -65,7 +65,7 @@ dsl_dataset_bmark_lookup(dsl_dataset_t *ds, const char *shortname, if (bmark_zapobj == 0) return (SET_ERROR(ESRCH)); - if (ds->ds_phys->ds_flags & DS_FLAG_CI_DATASET) + if (dsl_dataset_phys(ds)->ds_flags & DS_FLAG_CI_DATASET) mt = MT_FIRST; else mt = MT_EXACT; @@ -208,10 +208,11 @@ dsl_bookmark_create_sync(void *arg, dmu_tx_t *tx) &bmark_fs->ds_bookmarks, tx)); } - bmark_phys.zbm_guid = snapds->ds_phys->ds_guid; - bmark_phys.zbm_creation_txg = snapds->ds_phys->ds_creation_txg; + bmark_phys.zbm_guid = dsl_dataset_phys(snapds)->ds_guid; + bmark_phys.zbm_creation_txg = + dsl_dataset_phys(snapds)->ds_creation_txg; bmark_phys.zbm_creation_time = - snapds->ds_phys->ds_creation_time; + dsl_dataset_phys(snapds)->ds_creation_time; VERIFY0(zap_add(mos, bmark_fs->ds_bookmarks, shortname, sizeof (uint64_t), @@ -340,7 +341,7 @@ dsl_dataset_bookmark_remove(dsl_dataset_t *ds, const char *name, dmu_tx_t *tx) uint64_t bmark_zapobj = ds->ds_bookmarks; matchtype_t mt; - if (ds->ds_phys->ds_flags & DS_FLAG_CI_DATASET) + if (dsl_dataset_phys(ds)->ds_flags & DS_FLAG_CI_DATASET) mt = MT_FIRST; else mt = MT_EXACT; |