git: f860ce815177 - main - zfs: mix mismerge in zfs_znode_free

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=f860ce8151776ae7fcf630f9212a239e6b44dbf9

commit f860ce8151776ae7fcf630f9212a239e6b44dbf9
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2022-10-08 20:43:33 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2022-10-08 20:43:33 +0000

    zfs: mix mismerge in zfs_znode_free
    
    happens to be a noop
---
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
index a6b1668bc150..6345e9e69d30 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c
@@ -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);