git: 7ba12ba0a2df - stable/13 - zfs: use atomic_load_consume_ptr for z_cached_symlink

Mateusz Guzik mjg at FreeBSD.org
Mon Feb 1 12:46:39 UTC 2021


The branch stable/13 has been updated by mjg:

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

commit 7ba12ba0a2df573d055c7f088e666d86e4fea898
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-25 20:15:19 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-02-01 12:39:16 +0000

    zfs: use atomic_load_consume_ptr for z_cached_symlink
    
    (cherry picked from commit 7af02ef0b222eebad4827a264454e85134692e94)
---
 sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
index 1ee0895625a6..42f5786ce5c7 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
@@ -4476,10 +4476,7 @@ zfs_freebsd_fplookup_symlink(struct vop_fplookup_symlink_args *v)
 		return (EAGAIN);
 	}
 
-	/*
-	 * FIXME: Load consume would be sufficient but there is no primitive to do it.
-	 */
-	target = (char *)atomic_load_acq_ptr((uintptr_t *)&zp->z_cached_symlink);
+	target = atomic_load_consume_ptr(&zp->z_cached_symlink);
 	if (target == NULL) {
 		return (EAGAIN);
 	}


More information about the dev-commits-src-all mailing list