| Message ID | 28d51b8df8225be1798b3ffe2e9315c93ad03d92.1450177455.git.zhaolei@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 367e8ec..d411444 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6056,7 +6056,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) {
Old code use bbio->raid_map to determine whether in raid56 write/recover operation, because we don't have bbio->map_type that time, and have to use above workaround. Now we have direct way for this condition, to get gid of using the function-relative data, and make code readable. Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> --- fs/btrfs/volumes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)