projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
reada.c
diff --git
a/fs/btrfs/reada.c
b/fs/btrfs/reada.c
index 96b93daa0bbb484440e5d51b605ea15884cb9148..1031b69252c5a235046e7732d378e14865e54b50 100644
(file)
--- a/
fs/btrfs/reada.c
+++ b/
fs/btrfs/reada.c
@@
-955,10
+955,11
@@
int btrfs_reada_wait(void *handle)
while (atomic_read(&rc->elems)) {
wait_event_timeout(rc->wait, atomic_read(&rc->elems) == 0,
5 * HZ);
while (atomic_read(&rc->elems)) {
wait_event_timeout(rc->wait, atomic_read(&rc->elems) == 0,
5 * HZ);
- dump_devs(rc->root->fs_info, rc->elems < 10 ? 1 : 0);
+ dump_devs(rc->root->fs_info,
+ atomic_read(&rc->elems) < 10 ? 1 : 0);
}
}
- dump_devs(rc->root->fs_info,
rc->elems
< 10 ? 1 : 0);
+ dump_devs(rc->root->fs_info,
atomic_read(&rc->elems)
< 10 ? 1 : 0);
kref_put(&rc->refcnt, reada_control_release);
kref_put(&rc->refcnt, reada_control_release);