diff options
| author | Andrea Parri <andrea.parri@amarulasolutions.com> | 2019-05-20 19:23:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:46:00 -0700 |
| commit | b78255d6cffbc464f3c554724ccbf26b0af8f881 (patch) | |
| tree | 0eeaabc975ee2c88513ef4f0f9ae047475989c27 /include/linux/bio.h | |
| parent | 432ec4fa6cd204692ce0ce6a7bfcf0f5ec0b6633 (diff) | |
| download | linux-stable-b78255d6cffbc464f3c554724ccbf26b0af8f881.tar.gz linux-stable-b78255d6cffbc464f3c554724ccbf26b0af8f881.tar.bz2 linux-stable-b78255d6cffbc464f3c554724ccbf26b0af8f881.zip | |
bio: fix improper use of smp_mb__before_atomic()
commit f381c6a4bd0ae0fde2d6340f1b9bb0f58d915de6 upstream.
This barrier only applies to the read-modify-write operations; in
particular, it does not apply to the atomic_set() primitive.
Replace the barrier with an smp_mb().
Fixes: dac56212e8127 ("bio: skip atomic inc/dec of ->bi_cnt for most use cases")
Cc: stable@vger.kernel.org
Reported-by: "Paul E. McKenney" <paulmck@linux.ibm.com>
Reported-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: linux-block@vger.kernel.org
Cc: "Paul E. McKenney" <paulmck@linux.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 51371740d2a8..c7433a201171 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -257,7 +257,7 @@ static inline void bio_cnt_set(struct bio *bio, unsigned int count) { if (count != 1) { bio->bi_flags |= (1 << BIO_REFFED); - smp_mb__before_atomic(); + smp_mb(); } atomic_set(&bio->__bi_cnt, count); } |