mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Illumos 5314 - Remove "dbuf phys" db->db_data pointer aliases in ZFS
5314 Remove "dbuf phys" db->db_data pointer aliases in ZFS Author: Justin T. Gibbs <justing@spectralogic.com> 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> References: https://www.illumos.org/issues/5314 https://github.com/illumos/illumos-gate/commit/c137962 Ported-by: Chris Dunlop <chris@onthe.net.au> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
committed by
Brian Behlendorf
parent
945dd93525
commit
d683ddbb72
+3
-4
@@ -1363,7 +1363,7 @@ sa_handle_destroy(sa_handle_t *hdl)
|
||||
{
|
||||
mutex_enter(&hdl->sa_lock);
|
||||
(void) dmu_buf_update_user((dmu_buf_t *)hdl->sa_bonus, hdl,
|
||||
NULL, NULL, NULL);
|
||||
NULL, NULL);
|
||||
|
||||
if (hdl->sa_bonus_tab) {
|
||||
sa_idx_tab_rele(hdl->sa_os, hdl->sa_bonus_tab);
|
||||
@@ -1410,8 +1410,7 @@ sa_handle_get_from_db(objset_t *os, dmu_buf_t *db, void *userp,
|
||||
|
||||
error = sa_build_index(handle, SA_BONUS);
|
||||
newhandle = (hdl_type == SA_HDL_SHARED) ?
|
||||
dmu_buf_set_user_ie(db, handle,
|
||||
NULL, sa_evict) : NULL;
|
||||
dmu_buf_set_user_ie(db, handle, sa_evict) : NULL;
|
||||
|
||||
if (newhandle != NULL) {
|
||||
kmem_cache_free(sa_cache, handle);
|
||||
@@ -1951,7 +1950,7 @@ void
|
||||
sa_update_user(sa_handle_t *newhdl, sa_handle_t *oldhdl)
|
||||
{
|
||||
(void) dmu_buf_update_user((dmu_buf_t *)newhdl->sa_bonus,
|
||||
oldhdl, newhdl, NULL, sa_evict);
|
||||
oldhdl, newhdl, sa_evict);
|
||||
oldhdl->sa_bonus = NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user