diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2014-09-12 12:44:02 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-09-17 22:39:00 +0200 |
| commit | 28e1cc7d1baf8038ae4ad4681c8f3dc94fcd7c00 (patch) | |
| tree | 0d823d67ce5cb6eb1a12ab9aff5a49a7abde079d /fs/btrfs/volumes.c | |
| parent | Btrfs: modify clean_io_failure and make it suit direct io (diff) | |
| download | linux-28e1cc7d1baf8038ae4ad4681c8f3dc94fcd7c00.tar.xz linux-28e1cc7d1baf8038ae4ad4681c8f3dc94fcd7c00.zip | |
Btrfs: Set real mirror number for read operation on RAID0/5/6
We need real mirror number for RAID0/5/6 when reading data, or if read error
happens, we would pass 0 as the number of the mirror on which the io error
happens. It is wrong and would cause the filesystem read the data from the
corrupted mirror again.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 77d7fbc0fa47..63e632746d8a 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5073,6 +5073,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, num_stripes = min_t(u64, map->num_stripes, stripe_nr_end - stripe_nr_orig); stripe_index = do_div(stripe_nr, map->num_stripes); + if (!(rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS))) + mirror_num = 1; } else if (map->type & BTRFS_BLOCK_GROUP_RAID1) { if (rw & (REQ_WRITE | REQ_DISCARD | REQ_GET_READ_MIRRORS)) num_stripes = map->num_stripes; @@ -5176,6 +5178,9 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw, /* We distribute the parity blocks across stripes */ tmp = stripe_nr + stripe_index; stripe_index = do_div(tmp, map->num_stripes); + if (!(rw & (REQ_WRITE | REQ_DISCARD | + REQ_GET_READ_MIRRORS)) && mirror_num <= 1) + mirror_num = 1; } } else { /* |