diff options
| author | Chris Mason <clm@fb.com> | 2014-12-02 18:42:03 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-12-02 18:42:03 -0800 |
| commit | 9627aeee3e203e30679549e4962633698a6bf87f (patch) | |
| tree | 30ee313a7049bf3fcc17e346df5737e967fd9a95 /fs/btrfs/dev-replace.c | |
| parent | cb83b7b81698a4abe531e0ba18b9e288b06947ce (diff) | |
| parent | 5d3edd8f44aac94de7b16f4c54290e24f5e8c532 (diff) | |
| download | op-kernel-dev-9627aeee3e203e30679549e4962633698a6bf87f.zip op-kernel-dev-9627aeee3e203e30679549e4962633698a6bf87f.tar.gz | |
Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 3fbd062..ca6a3a3 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -316,11 +316,6 @@ int btrfs_dev_replace_start(struct btrfs_root *root, struct btrfs_device *tgt_device = NULL; struct btrfs_device *src_device = NULL; - if (btrfs_fs_incompat(fs_info, RAID56)) { - btrfs_warn(fs_info, "dev_replace cannot yet handle RAID5/RAID6"); - return -EOPNOTSUPP; - } - switch (args->start.cont_reading_from_srcdev_mode) { case BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_ALWAYS: case BTRFS_IOCTL_DEV_REPLACE_CONT_READING_FROM_SRCDEV_MODE_AVOID: @@ -927,9 +922,9 @@ void btrfs_bio_counter_inc_noblocked(struct btrfs_fs_info *fs_info) percpu_counter_inc(&fs_info->bio_counter); } -void btrfs_bio_counter_dec(struct btrfs_fs_info *fs_info) +void btrfs_bio_counter_sub(struct btrfs_fs_info *fs_info, s64 amount) { - percpu_counter_dec(&fs_info->bio_counter); + percpu_counter_sub(&fs_info->bio_counter, amount); if (waitqueue_active(&fs_info->replace_wait)) wake_up(&fs_info->replace_wait); |
