]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Btrfs: fix wrong failed mirror_num of read-repair on raid56
authorLiu Bo <bo.li.liu@oracle.com>
Wed, 29 Mar 2017 17:54:26 +0000 (10:54 -0700)
committerDavid Sterba <dsterba@suse.com>
Tue, 18 Apr 2017 12:07:26 +0000 (14:07 +0200)
In raid56 scenario, after trying parity recovery, we didn't set
mirror_num for btrfs_bio with failed mirror_num, hence
end_bio_extent_readpage() will report a random mirror_num in dmesg
log.

Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/raid56.c

index a8954f5188b4d8a6e064ea84d2f214c9ced6a251..7bf65d9a9bd3230616ecbd6e994390cee8cc4b31 100644 (file)
@@ -2117,6 +2117,11 @@ int raid56_parity_recover(struct btrfs_fs_info *fs_info, struct bio *bio,
        struct btrfs_raid_bio *rbio;
        int ret;
 
+       if (generic_io) {
+               ASSERT(bbio->mirror_num == mirror_num);
+               btrfs_io_bio(bio)->mirror_num = mirror_num;
+       }
+
        rbio = alloc_rbio(fs_info, bbio, stripe_len);
        if (IS_ERR(rbio)) {
                if (generic_io)