Skip to content

Commit 8269cfe

Browse files
committed
Merge: Fixes for: NFS - the task is blocked at __nfs_lookup_revalidate
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7426 JIRA: https://issues.redhat.com/browse/RHEL-117497 We're missing an smp_mb() before waking the waiters - to fix as upstream, we should take most of the series here: https://lore.kernel.org/all/20240826063659.15327-1-neilb@suse.de/ and then the NFS fix from Trond: 1db3a48 NFS: Fix wakeup of __nfs_lookup_revalidate() in unblock_revalidate() And just to make the bots happy: Omitted-fix: 7266f0a ... because its not a fix for work here, and we don't maintain bcachefs in RHEL. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: Jay Shin <jaeshin@redhat.com> Approved-by: Scott Mayhew <smayhew@redhat.com> Approved-by: Olga Kornievskaia <okorniev@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Patrick Talbert <ptalbert@redhat.com>
2 parents 27508b8 + 6e4f075 commit 8269cfe

File tree

3 files changed

+389
-103
lines changed

3 files changed

+389
-103
lines changed

fs/nfs/dir.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,9 +1840,7 @@ static void block_revalidate(struct dentry *dentry)
18401840

18411841
static void unblock_revalidate(struct dentry *dentry)
18421842
{
1843-
/* store_release ensures wait_var_event() sees the update */
1844-
smp_store_release(&dentry->d_fsdata, NULL);
1845-
wake_up_var(&dentry->d_fsdata);
1843+
store_release_wake_up(&dentry->d_fsdata, NULL);
18461844
}
18471845

18481846
/*

0 commit comments

Comments
 (0)