btrfs: raid56: make set_bio_pages_uptodate() subpage compatible

Unlike previous code, we can not directly set PageUptodate for stripe
pages now.  Instead we have to iterate through all the sectors and set
SECTOR_UPTODATE flag there.

Introduce a new helper find_stripe_sector(), to do the work.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 79ab68307205d1699f14a32a98a2952e58740946..08c4c5a11f977965a533203fec5e23b738961083 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1490,19 +1490,49 @@ static int fail_bio_stripe(struct btrfs_raid_bio *rbio,
        return fail_rbio_index(rbio, failed);
 }
 
+/*
+ * For subpage case, we can no longer set page Uptodate directly for
+ * stripe_pages[], thus we need to locate the sector.
+ */
+static struct sector_ptr *find_stripe_sector(struct btrfs_raid_bio *rbio,
+                                            struct page *page,
+                                            unsigned int pgoff)
+{
+       int i;
+
+       for (i = 0; i < rbio->nr_sectors; i++) {
+               struct sector_ptr *sector = &rbio->stripe_sectors[i];
+
+               if (sector->page == page && sector->pgoff == pgoff)
+                       return sector;
+       }
+       return NULL;
+}
+
 /*
  * this sets each page in the bio uptodate.  It should only be used on private
  * rbio pages, nothing that comes in from the higher layers
  */
-static void set_bio_pages_uptodate(struct bio *bio)
+static void set_bio_pages_uptodate(struct btrfs_raid_bio *rbio, struct bio *bio)
 {
+       const u32 sectorsize = rbio->bioc->fs_info->sectorsize;
        struct bio_vec *bvec;
        struct bvec_iter_all iter_all;
 
        ASSERT(!bio_flagged(bio, BIO_CLONED));
 
-       bio_for_each_segment_all(bvec, bio, iter_all)
-               SetPageUptodate(bvec->bv_page);
+       bio_for_each_segment_all(bvec, bio, iter_all) {
+               struct sector_ptr *sector;
+               int pgoff;
+
+               for (pgoff = bvec->bv_offset; pgoff - bvec->bv_offset < bvec->bv_len;
+                    pgoff += sectorsize) {
+                       sector = find_stripe_sector(rbio, bvec->bv_page, pgoff);
+                       ASSERT(sector);
+                       if (sector)
+                               sector->uptodate = 1;
+               }
+       }
 }
 
 /*
@@ -1520,7 +1550,7 @@ static void raid_rmw_end_io(struct bio *bio)
        if (bio->bi_status)
                fail_bio_stripe(rbio, bio);
        else
-               set_bio_pages_uptodate(bio);
+               set_bio_pages_uptodate(rbio, bio);
 
        bio_put(bio);
 
@@ -2076,7 +2106,7 @@ static void raid_recover_end_io(struct bio *bio)
        if (bio->bi_status)
                fail_bio_stripe(rbio, bio);
        else
-               set_bio_pages_uptodate(bio);
+               set_bio_pages_uptodate(rbio, bio);
        bio_put(bio);
 
        if (!atomic_dec_and_test(&rbio->stripes_pending))
@@ -2633,7 +2663,7 @@ static void raid56_parity_scrub_end_io(struct bio *bio)
        if (bio->bi_status)
                fail_bio_stripe(rbio, bio);
        else
-               set_bio_pages_uptodate(bio);
+               set_bio_pages_uptodate(rbio, bio);
 
        bio_put(bio);