[Linux-cachefs] [PATCH] Fix __wait_on_atomic_t() to call the action func if the counter != 0
David Howells
dhowells at redhat.com
Tue Jul 23 15:49:24 UTC 2013
Fix __wait_on_atomic_t() so that it calls the action func if the counter != 0
rather than if the counter is 0 so as to be analogous to __wait_on_bit().
Thanks to Yacine who found this by visual inspection.
This will affect FS-Cache in that it will could fail to sleep correctly when
trying to clean up after a netfs cookie is withdrawn.
Reported-by: Yacine Belkadi <yacine.belkadi.1 at gmail.com>
Signed-off-by: David Howells <dhowells at redhat.com>
cc: Yacine Belkadi <yacine.belkadi.1 at gmail.com>
cc: Milosz Tanski <milosz at adfin.com>
cc: Jeff Layton <jlayton at redhat.com>
---
kernel/wait.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/wait.c b/kernel/wait.c
index ce0daa3..dec68bd 100644
--- a/kernel/wait.c
+++ b/kernel/wait.c
@@ -333,7 +333,8 @@ int __wait_on_atomic_t(wait_queue_head_t *wq, struct wait_bit_queue *q,
prepare_to_wait(wq, &q->wait, mode);
val = q->key.flags;
if (atomic_read(val) == 0)
- ret = (*action)(val);
+ break;
+ ret = (*action)(val);
} while (!ret && atomic_read(val) != 0);
finish_wait(wq, &q->wait);
return ret;
More information about the Linux-cachefs
mailing list