diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-01-20 20:11:30 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-01-20 20:11:30 +0000 |
| commit | 871e4ea882f72e65f100b5700773632fbe603b80 (patch) | |
| tree | 2a0657a9e6c1dedd1a5f89c0be335d4c76439f0f /uts/common/fs/zfs/dsl_bookmark.c | |
| parent | 8f4cea4c428b6f0e59c03488ff66ee9788de95ec (diff) | |
| download | src-871e4ea882f72e65f100b5700773632fbe603b80.tar.gz src-871e4ea882f72e65f100b5700773632fbe603b80.zip | |
5056 ZFS deadlock on db_mtx and dn_holds
Reviewed by: Will Andrews <willa@spectralogic.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Justin Gibbs <justing@spectralogic.com>
illumos/illumos-gate@bc9014e6a81272073b9854d9f65dd59e18d18c35
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=277428
Diffstat (limited to 'uts/common/fs/zfs/dsl_bookmark.c')
| -rw-r--r-- | uts/common/fs/zfs/dsl_bookmark.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uts/common/fs/zfs/dsl_bookmark.c b/uts/common/fs/zfs/dsl_bookmark.c index 5fb7f96600dc..bc08d1c10e8e 100644 --- a/uts/common/fs/zfs/dsl_bookmark.c +++ b/uts/common/fs/zfs/dsl_bookmark.c @@ -120,7 +120,7 @@ dsl_bookmark_create_check_impl(dsl_dataset_t *snapds, const char *bookmark_name, int error; zfs_bookmark_phys_t bmark_phys; - if (!dsl_dataset_is_snapshot(snapds)) + if (!snapds->ds_is_snapshot) return (SET_ERROR(EINVAL)); error = dsl_bookmark_hold_ds(dp, bookmark_name, |