fscache: Fix if condition in fscache_wait_on_volume_collision()
commitbf17455b9c
upstream. After waiting for the volume to complete the acquisition with timeout, the if condition under which potential volume collision occurs should be acquire the volume is still pending rather than not pending so that we will continue to wait until the pending flag is cleared. Also, use the existing test pending wrapper directly instead of test_bit(). Fixes:62ab633523
("fscache: Implement volume registration") Signed-off-by: Yue Hu <huyue2@coolpad.com> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Reviewed-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Link: https://listman.redhat.com/archives/linux-cachefs/2022-May/006918.html Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b1ae9f617f
commit
3bfb7931df
|
@ -143,7 +143,7 @@ static void fscache_wait_on_volume_collision(struct fscache_volume *candidate,
|
|||
{
|
||||
wait_var_event_timeout(&candidate->flags,
|
||||
!fscache_is_acquire_pending(candidate), 20 * HZ);
|
||||
if (!fscache_is_acquire_pending(candidate)) {
|
||||
if (fscache_is_acquire_pending(candidate)) {
|
||||
pr_notice("Potential volume collision new=%08x old=%08x",
|
||||
candidate->debug_id, collidee_debug_id);
|
||||
fscache_stat(&fscache_n_volumes_collision);
|
||||
|
@ -182,7 +182,7 @@ static bool fscache_hash_volume(struct fscache_volume *candidate)
|
|||
hlist_bl_add_head(&candidate->hash_link, h);
|
||||
hlist_bl_unlock(h);
|
||||
|
||||
if (test_bit(FSCACHE_VOLUME_ACQUIRE_PENDING, &candidate->flags))
|
||||
if (fscache_is_acquire_pending(candidate))
|
||||
fscache_wait_on_volume_collision(candidate, collidee_debug_id);
|
||||
return true;
|
||||
|
||||
|
|
Loading…
Reference in New Issue