aboutsummaryrefslogtreecommitdiff
path: root/fs/fscache
diff options
context:
space:
mode:
authorHou Tao2023-01-13 19:52:11 +0800
committerGreg Kroah-Hartman2023-02-22 12:59:43 +0100
commitb266c2e72ef319ebc6ae298766c81bfd3ec33f57 (patch)
treee4630135e2dfca42762ff6de4805295f12263161 /fs/fscache
parent63c12d00d8565bc0d36ec32491e3f52f91498a49 (diff)
fscache: Use clear_and_wake_up_bit() in fscache_create_volume_work()
[ Upstream commit 3288666c72568fe1cc7f5c5ae33dfd3ab18004c8 ] fscache_create_volume_work() uses wake_up_bit() to wake up the processes which are waiting for the completion of volume creation. According to comments in wake_up_bit() and waitqueue_active(), an extra smp_mb() is needed to guarantee the memory order between FSCACHE_VOLUME_CREATING flag and waitqueue_active() before invoking wake_up_bit(). Fixing it by using clear_and_wake_up_bit() to add the missing memory barrier. Reviewed-by: Jingbo Xu <jefflexu@linux.alibaba.com> Signed-off-by: Hou Tao <houtao1@huawei.com> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Link: https://lore.kernel.org/r/20230113115211.2895845-3-houtao@huaweicloud.com/ # v3 Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/fscache')
-rw-r--r--fs/fscache/volume.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/fscache/volume.c b/fs/fscache/volume.c
index 903af9d85f8b..cdf991bdd9de 100644
--- a/fs/fscache/volume.c
+++ b/fs/fscache/volume.c
@@ -280,8 +280,7 @@ static void fscache_create_volume_work(struct work_struct *work)
fscache_end_cache_access(volume->cache,
fscache_access_acquire_volume_end);
- clear_bit_unlock(FSCACHE_VOLUME_CREATING, &volume->flags);
- wake_up_bit(&volume->flags, FSCACHE_VOLUME_CREATING);
+ clear_and_wake_up_bit(FSCACHE_VOLUME_CREATING, &volume->flags);
fscache_put_volume(volume, fscache_volume_put_create_work);
}