Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux.git] / drivers / md / raid1.c

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7b0f647bcccb513b6650136cddd51bc0ebec796a..830ff2b203463ef075d53a6c7a2ae22e0ec2c7d9 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -744,9 +744,9 @@ static int raid1_congested(struct mddev *mddev, int bits)
                         * non-congested targets, it can be removed
                         */
                        if ((bits & (1 << WB_async_congested)) || 1)
-                               ret |= bdi_congested(&q->backing_dev_info, bits);
+                               ret |= bdi_congested(q->backing_dev_info, bits);
                        else
-                               ret &= bdi_congested(&q->backing_dev_info, bits);
+                               ret &= bdi_congested(q->backing_dev_info, bits);
                }
        }
        rcu_read_unlock();
@@ -1170,10 +1170,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
        int i, disks;
        struct bitmap *bitmap = mddev->bitmap;
        unsigned long flags;
-       const int op = bio_op(bio);
-       const unsigned long do_sync = (bio->bi_opf & REQ_SYNC);
-       const unsigned long do_flush_fua = (bio->bi_opf &
-                                               (REQ_PREFLUSH | REQ_FUA));
        struct md_rdev *blocked_rdev;
        struct blk_plug_cb *cb;
        struct raid1_plug_cb *plug = NULL;
@@ -1389,7 +1385,8 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                                   conf->mirrors[i].rdev->data_offset);
                mbio->bi_bdev = conf->mirrors[i].rdev->bdev;
                mbio->bi_end_io = raid1_end_write_request;
-               bio_set_op_attrs(mbio, op, do_flush_fua | do_sync);
+               mbio->bi_opf = bio_op(bio) |
+                       (bio->bi_opf & (REQ_SYNC | REQ_PREFLUSH | REQ_FUA));
                if (test_bit(FailFast, &conf->mirrors[i].rdev->flags) &&
                    !test_bit(WriteMostly, &conf->mirrors[i].rdev->flags) &&
                    conf->raid_disks - mddev->degraded > 1)