aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@canonical.com>2010-12-08 20:29:46 +0000
committerJohn Rigby <john.rigby@linaro.org>2012-06-25 15:02:12 -0600
commit647ee03d851126dec80b39750081aca83dbff5ff (patch)
tree4a70ba7983cd5918f5577e38314635241021077c
parent0b4e1c646655ca4d647e892283ed012ec78d8d24 (diff)
UBUNTU: ubuntu: dm-raid4-5 -- follow changes to bio flags
commit 7b6d91daee5cac6402186ff224c3af39d79f4a0e Author: Christoph Hellwig <hch@lst.de> Date: Sat Aug 7 18:20:39 2010 +0200 block: unify flags for struct bio and struct request Follow the following transitions: bio_rw_flagged(bio, BIO_RW_BARRIER)) -> (bio->bi_rw & REQ_HARDBARRIER) -> (bio->bi_rw & REQ_FLUSH) Signed-off-by: Andy Whitcroft <apw@canonical.com>
-rw-r--r--ubuntu/dm-raid4-5/dm-raid4-5.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c
index 7f4565fa3de..504aee38d03 100644
--- a/ubuntu/dm-raid4-5/dm-raid4-5.c
+++ b/ubuntu/dm-raid4-5/dm-raid4-5.c
@@ -3228,7 +3228,7 @@ static void do_ios(struct raid_set *rs, struct bio_list *ios)
* the input queue unless all work queues are empty
* and the stripe cache is inactive.
*/
- if (unlikely(bio_rw_flagged(bio, BIO_RW_BARRIER))) {
+ if (unlikely(bio->bi_rw & REQ_FLUSH)) {
/* REMOVEME: statistics. */
atomic_inc(rs->stats + S_BARRIER);
if (delay ||