Merge tag 'vfs-5.4-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / block / bfq-wf2q.c

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index c9ba225..05f0bf4 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) {