From 006555d42aab210a05d1a45b25045d39c06e1434 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 15 May 2023 14:55:19 -0400 Subject: [PATCH] READ_ONCE() replaces ACCESS_ONCE() v3.18-rc3-2-g230fa253df63 forces us to remove ACCESS_ONCE() with READ_ONCE(), but it is probably the better interface and works with non-scalar types. Signed-off-by: Auke Kok --- kmod/src/dir.c | 2 +- kmod/src/lock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kmod/src/dir.c b/kmod/src/dir.c index d3a6e031..aa1272af 100644 --- a/kmod/src/dir.c +++ b/kmod/src/dir.c @@ -272,7 +272,7 @@ static void set_dentry_fsdata(struct dentry *dentry, struct scoutfs_lock *lock) static bool test_dentry_fsdata(struct dentry *dentry, u64 refresh) { - u64 fsd = (unsigned long)ACCESS_ONCE(dentry->d_fsdata); + u64 fsd = (unsigned long)READ_ONCE(dentry->d_fsdata); return fsd == refresh; } diff --git a/kmod/src/lock.c b/kmod/src/lock.c index bd726cec..5be16d3c 100644 --- a/kmod/src/lock.c +++ b/kmod/src/lock.c @@ -1346,7 +1346,7 @@ void scoutfs_lock_del_coverage(struct super_block *sb, bool scoutfs_lock_protected(struct scoutfs_lock *lock, struct scoutfs_key *key, enum scoutfs_lock_mode mode) { - signed char lock_mode = ACCESS_ONCE(lock->mode); + signed char lock_mode = READ_ONCE(lock->mode); return lock_modes_match(lock_mode, mode) && scoutfs_key_compare_ranges(key, key,