Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Remove unnecessary cache allocation in zfs_znode_hold_enter 

remove the *zh_new pointer in zfs_znode_hold_enter. When avl_find()
cannot find *zh,kmem_cache_alloc() is used to allocate cache and
kmem_cache_free() is removed.

Signed-off-by: GreatRiver Shen <great.river703@gmail.com>
This commit is contained in:
GreatRiver 2024-08-04 21:04:49 +08:00
parent c8184d714b
commit af677b6ed3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/os/linux/zfs/zfs_znode.c
View File

@ -275,30 +275,24 @@ zfs_znode_held(zfsvfs_t *zfsvfs, uint64_t obj)
znode_hold_t * znode_hold_t *
zfs_znode_hold_enter(zfsvfs_t *zfsvfs, uint64_t obj) zfs_znode_hold_enter(zfsvfs_t *zfsvfs, uint64_t obj)
{ {
znode_hold_t *zh, *zh_new, search; znode_hold_t *zh, search;
int i = ZFS_OBJ_HASH(zfsvfs, obj); int i = ZFS_OBJ_HASH(zfsvfs, obj);
boolean_t found = B_FALSE;
zh_new = kmem_cache_alloc(znode_hold_cache, KM_SLEEP);
search.zh_obj = obj; search.zh_obj = obj;
mutex_enter(&zfsvfs->z_hold_locks[i]); mutex_enter(&zfsvfs->z_hold_locks[i]);
zh = avl_find(&zfsvfs->z_hold_trees[i], &search, NULL); zh = avl_find(&zfsvfs->z_hold_trees[i], &search, NULL);
if (likely(zh == NULL)) { if (likely(zh == NULL)) {
zh = zh_new; zh = kmem_cache_alloc(znode_hold_cache, KM_SLEEP);
zh->zh_obj = obj; zh->zh_obj = obj;
avl_add(&zfsvfs->z_hold_trees[i], zh); avl_add(&zfsvfs->z_hold_trees[i], zh);
} else { } else {
ASSERT3U(zh->zh_obj, ==, obj); ASSERT3U(zh->zh_obj, ==, obj);
found = B_TRUE;
} }
zh->zh_refcount++; zh->zh_refcount++;
ASSERT3S(zh->zh_refcount, >, 0); ASSERT3S(zh->zh_refcount, >, 0);
mutex_exit(&zfsvfs->z_hold_locks[i]); mutex_exit(&zfsvfs->z_hold_locks[i]);
if (found == B_TRUE)
kmem_cache_free(znode_hold_cache, zh_new);
ASSERT(MUTEX_NOT_HELD(&zh->zh_lock)); ASSERT(MUTEX_NOT_HELD(&zh->zh_lock));
mutex_enter(&zh->zh_lock); mutex_enter(&zh->zh_lock);