diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-14 14:03:06 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-14 14:03:06 +0000 |
| commit | eb8f6f014c29ae7a6650458f49da8960ed82bfcf (patch) | |
| tree | d8cc134dc1a4d3119493593b836822d612768dc5 /usr/src/uts/common/fs/zfs/dsl_dir.c | |
| parent | 91b5490a419451a7a9fad5fff2b5f1f83ad87955 (diff) | |
| parent | 1d32ba663e202c24a5a1f2e5aef83fffb447cb7f (diff) | |
| download | illumos-joyent-eb8f6f014c29ae7a6650458f49da8960ed82bfcf.tar.gz | |
[illumos-gate merge]
commit 1d32ba663e202c24a5a1f2e5aef83fffb447cb7f
7290 ZFS test suite needs to control what utilities it can run
commit f4fb84c03b3f4c46dab36872e953dd3c27317c3a
7576 Print the correct size of loader.efi when failing to load it into memory.
commit 40510e8eba18690b9a9843b26393725eeb0f1dac
6676 Race between unique_insert() and unique_remove() causes ZFS fsid change
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_dir.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_dir.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_dir.c b/usr/src/uts/common/fs/zfs/dsl_dir.c index 27ef2838c9..60477b20eb 100644 --- a/usr/src/uts/common/fs/zfs/dsl_dir.c +++ b/usr/src/uts/common/fs/zfs/dsl_dir.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2014 by Delphix. All rights reserved. + * Copyright (c) 2012, 2016 by Delphix. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. * Copyright (c) 2014 Joyent, Inc. All rights reserved. * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved. @@ -129,7 +129,7 @@ extern inline dsl_dir_phys_t *dsl_dir_phys(dsl_dir_t *dd); static uint64_t dsl_dir_space_towrite(dsl_dir_t *dd); static void -dsl_dir_evict(void *dbu) +dsl_dir_evict_async(void *dbu) { dsl_dir_t *dd = dbu; dsl_pool_t *dp = dd->dd_pool; @@ -236,7 +236,8 @@ dsl_dir_hold_obj(dsl_pool_t *dp, uint64_t ddobj, dmu_buf_rele(origin_bonus, FTAG); } - dmu_buf_init_user(&dd->dd_dbu, dsl_dir_evict, &dd->dd_dbuf); + dmu_buf_init_user(&dd->dd_dbu, NULL, dsl_dir_evict_async, + &dd->dd_dbuf); winner = dmu_buf_set_user_ie(dbuf, &dd->dd_dbu); if (winner != NULL) { if (dd->dd_parent) |