projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-block.git]
/
block
/
bfq-wf2q.c
diff --git
a/block/bfq-wf2q.c
b/block/bfq-wf2q.c
index c9ba225081ceef58d5d36a569541af689526c7fd..05f0bf4a1144d79fc26e0024221907f1066182c5 100644
(file)
--- a/
block/bfq-wf2q.c
+++ b/
block/bfq-wf2q.c
@@
-744,6
+744,8
@@
__bfq_entity_update_weight_prio(struct bfq_service_tree *old_st,
}
#endif
+ /* Matches the smp_wmb() in bfq_group_set_weight. */
+ smp_rmb();
old_st->wsum -= entity->weight;
if (entity->new_weight != entity->orig_weight) {