btrfs: disable the device add feature for temp-fsid

[linux-2.6-microblaze.git] / fs / btrfs / raid56.c

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 0249ea5..3e014b9 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -584,8 +584,7 @@ static int rbio_can_merge(struct btrfs_raid_bio *last,
        if (last->operation == BTRFS_RBIO_PARITY_SCRUB)
                return 0;
 
-       if (last->operation == BTRFS_RBIO_REBUILD_MISSING ||
-           last->operation == BTRFS_RBIO_READ_REBUILD)
+       if (last->operation == BTRFS_RBIO_READ_REBUILD)
                return 0;
 
        return 1;
@@ -784,10 +783,7 @@ static noinline void unlock_stripe(struct btrfs_raid_bio *rbio)
                        spin_unlock(&rbio->bio_list_lock);
                        spin_unlock(&h->lock);
 
-                       if (next->operation == BTRFS_RBIO_READ_REBUILD)
-                               start_async_work(next, recover_rbio_work_locked);
-                       else if (next->operation == BTRFS_RBIO_REBUILD_MISSING) {
-                               steal_rbio(rbio, next);
+                       if (next->operation == BTRFS_RBIO_READ_REBUILD) {
                                start_async_work(next, recover_rbio_work_locked);
                        } else if (next->operation == BTRFS_RBIO_WRITE) {
                                steal_rbio(rbio, next);
@@ -1517,11 +1513,11 @@ static void submit_read_wait_bio_list(struct btrfs_raid_bio *rbio,
        while ((bio = bio_list_pop(bio_list))) {
                bio->bi_end_io = raid_wait_read_end_io;
 
-               if (trace_raid56_scrub_read_recover_enabled()) {
+               if (trace_raid56_read_enabled()) {
                        struct raid56_bio_trace_info trace_info = { 0 };
 
                        bio_get_trace_info(rbio, bio, &trace_info);
-                       trace_raid56_scrub_read_recover(rbio, bio, &trace_info);
+                       trace_raid56_read(rbio, bio, &trace_info);
                }
                submit_bio(bio);
        }
@@ -1698,8 +1694,7 @@ static int verify_one_sector(struct btrfs_raid_bio *rbio,
         * If we're rebuilding a read, we have to use pages from the
         * bio list if possible.
         */
-       if ((rbio->operation == BTRFS_RBIO_READ_REBUILD ||
-            rbio->operation == BTRFS_RBIO_REBUILD_MISSING)) {
+       if (rbio->operation == BTRFS_RBIO_READ_REBUILD) {
                sector = sector_in_rbio(rbio, stripe_nr, sector_nr, 0);
        } else {
                sector = rbio_stripe_sector(rbio, stripe_nr, sector_nr);
@@ -1763,8 +1758,7 @@ static int recover_vertical(struct btrfs_raid_bio *rbio, int sector_nr,
                 * If we're rebuilding a read, we have to use pages from the
                 * bio list if possible.
                 */
-               if ((rbio->operation == BTRFS_RBIO_READ_REBUILD ||
-                    rbio->operation == BTRFS_RBIO_REBUILD_MISSING)) {
+               if (rbio->operation == BTRFS_RBIO_READ_REBUILD) {
                        sector = sector_in_rbio(rbio, stripe_nr, sector_nr, 0);
                } else {
                        sector = rbio_stripe_sector(rbio, stripe_nr, sector_nr);
@@ -1897,8 +1891,7 @@ static int recover_sectors(struct btrfs_raid_bio *rbio)
                goto out;
        }
 
-       if (rbio->operation == BTRFS_RBIO_READ_REBUILD ||
-           rbio->operation == BTRFS_RBIO_REBUILD_MISSING) {
+       if (rbio->operation == BTRFS_RBIO_READ_REBUILD) {
                spin_lock(&rbio->bio_list_lock);
                set_bit(RBIO_RMW_LOCKED_BIT, &rbio->flags);
                spin_unlock(&rbio->bio_list_lock);
@@ -2112,8 +2105,8 @@ static void fill_data_csums(struct btrfs_raid_bio *rbio)
                goto error;
        }
 
-       ret = btrfs_lookup_csums_bitmap(csum_root, start, start + len - 1,
-                                       rbio->csum_buf, rbio->csum_bitmap, false);
+       ret = btrfs_lookup_csums_bitmap(csum_root, NULL, start, start + len - 1,
+                                       rbio->csum_buf, rbio->csum_bitmap);
        if (ret < 0)
                goto error;
        if (bitmap_empty(rbio->csum_bitmap, len >> fs_info->sectorsize_bits))
@@ -2198,11 +2191,11 @@ static void submit_write_bios(struct btrfs_raid_bio *rbio,
        while ((bio = bio_list_pop(bio_list))) {
                bio->bi_end_io = raid_wait_write_end_io;
 
-               if (trace_raid56_write_stripe_enabled()) {
+               if (trace_raid56_write_enabled()) {
                        struct raid56_bio_trace_info trace_info = { 0 };
 
                        bio_get_trace_info(rbio, bio, &trace_info);
-                       trace_raid56_write_stripe(rbio, bio, &trace_info);
+                       trace_raid56_write(rbio, bio, &trace_info);
                }
                submit_bio(bio);
        }