drivers: media: pisp_be: Update seqeuence numbers of the buffers

[platform/kernel/linux-rpi.git] / drivers / md / raid1.c

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 2aabac7..9116702 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1983,12 +1983,12 @@ static void end_sync_write(struct bio *bio)
 }
 
 static int r1_sync_page_io(struct md_rdev *rdev, sector_t sector,
-                          int sectors, struct page *page, int rw)
+                          int sectors, struct page *page, blk_opf_t rw)
 {
        if (sync_page_io(rdev, sector, sectors << 9, page, rw, false))
                /* success */
                return 1;
-       if (rw == WRITE) {
+       if (rw == REQ_OP_WRITE) {
                set_bit(WriteErrorSeen, &rdev->flags);
                if (!test_and_set_bit(WantReplacement,
                                      &rdev->flags))
@@ -2105,7 +2105,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
                        rdev = conf->mirrors[d].rdev;
                        if (r1_sync_page_io(rdev, sect, s,
                                            pages[idx],
-                                           WRITE) == 0) {
+                                           REQ_OP_WRITE) == 0) {
                                r1_bio->bios[d]->bi_end_io = NULL;
                                rdev_dec_pending(rdev, mddev);
                        }
@@ -2120,7 +2120,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
                        rdev = conf->mirrors[d].rdev;
                        if (r1_sync_page_io(rdev, sect, s,
                                            pages[idx],
-                                           READ) != 0)
+                                           REQ_OP_READ) != 0)
                                atomic_add(s, &rdev->corrected_errors);
                }
                sectors -= s;
@@ -2332,7 +2332,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
                                atomic_inc(&rdev->nr_pending);
                                rcu_read_unlock();
                                r1_sync_page_io(rdev, sect, s,
-                                               conf->tmppage, WRITE);
+                                               conf->tmppage, REQ_OP_WRITE);
                                rdev_dec_pending(rdev, mddev);
                        } else
                                rcu_read_unlock();
@@ -2349,7 +2349,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
                                atomic_inc(&rdev->nr_pending);
                                rcu_read_unlock();
                                if (r1_sync_page_io(rdev, sect, s,
-                                                   conf->tmppage, READ)) {
+                                               conf->tmppage, REQ_OP_READ)) {
                                        atomic_add(s, &rdev->corrected_errors);
                                        pr_info("md/raid1:%s: read error corrected (%d sectors at %llu on %pg)\n",
                                                mdname(mddev), s,