zfs: mix mismerge in zfs_znode_free
happens to be a noop
This commit is contained in:
parent
1e9482f433
commit
f860ce8151
@ -1284,11 +1284,6 @@ zfs_znode_free(znode_t *zp)
|
||||
list_remove(&zfsvfs->z_all_znodes, zp);
|
||||
zfsvfs->z_nr_znodes--;
|
||||
mutex_exit(&zfsvfs->z_znodes_lock);
|
||||
symlink = atomic_load_ptr(&zp->z_cached_symlink);
|
||||
if (symlink != NULL) {
|
||||
atomic_store_rel_ptr((uintptr_t *)&zp->z_cached_symlink, (uintptr_t)NULL);
|
||||
cache_symlink_free(symlink, strlen(symlink) + 1);
|
||||
}
|
||||
|
||||
#if __FreeBSD_version >= 1300139
|
||||
symlink = atomic_load_ptr(&zp->z_cached_symlink);
|
||||
|
Loading…
Reference in New Issue
Block a user