diff options
| author | Zhao Lei <zhaolei@cn.fujitsu.com> | 2015-12-15 18:18:09 +0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-19 18:43:45 -0800 |
| commit | ad1ba2a0c453db255f04b17101db6d05c44d8467 (patch) | |
| tree | 76b4b001d9c01a6bd8376fd851266bad6256f250 /fs/btrfs | |
| parent | 94a97dfeb61e32a213ca5519b063076c5201c5b2 (diff) | |
| download | linux-ad1ba2a0c453db255f04b17101db6d05c44d8467.tar.bz2 | |
btrfs: Use direct way to determine raid56 write/recover mode
Old code used bbio->raid_map to determine whether in raid56
write/recover operation, because we didn't't have bbio->map_type.
Now we have direct way for this condition, rid of using
the function-relative data, and make the code more readable.
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/volumes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 7a769ca04f3f..366b335946fa 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6068,7 +6068,8 @@ int btrfs_map_bio(struct btrfs_root *root, int rw, struct bio *bio, bbio->fs_info = root->fs_info; atomic_set(&bbio->stripes_pending, bbio->num_stripes); - if (bbio->raid_map) { + if ((bbio->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK) && + ((rw & WRITE) || (mirror_num > 1))) { /* In this case, map_length has been set to the length of a single stripe; not the whole write */ if (rw & WRITE) { |