git: 7af02ef0b222 - main - zfs: use atomic_load_consume_ptr for z_cached_symlink

Mateusz Guzik mjg at FreeBSD.org
Mon Jan 25 22:42:44 UTC 2021


The branch main has been updated by mjg:

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

commit 7af02ef0b222eebad4827a264454e85134692e94
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-01-25 20:15:19 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-01-25 22:40:15 +0000

    zfs: use atomic_load_consume_ptr for z_cached_symlink
---
 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 365c64a9479c..35e54a2e1560 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
@@ -4477,10 +4477,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