summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/raid56.h
diff options
context:
space:
mode:
authorMiao Xie <miaox@cn.fujitsu.com>2014-11-25 16:39:28 +0800
committerMiao Xie <miaox@cn.fujitsu.com>2014-12-03 10:18:47 +0800
commit4245215d6a8dba1a51c50533b6667919687c0b89 (patch)
treed3d988c61ff1dcf8fe6886e3c2ba3783814d614e /fs/btrfs/raid56.h
parent7603597690147a16b5cc77047d7570fa22a22673 (diff)
downloadblackbird-op-linux-4245215d6a8dba1a51c50533b6667919687c0b89.tar.gz
blackbird-op-linux-4245215d6a8dba1a51c50533b6667919687c0b89.zip
Btrfs, raid56: fix use-after-free problem in the final device replace procedure on raid56
The commit c404e0dc (Btrfs: fix use-after-free in the finishing procedure of the device replace) fixed a use-after-free problem which happened when removing the source device at the end of device replace, but at that time, btrfs didn't support device replace on raid56, so we didn't fix the problem on the raid56 profile. Currently, we implemented device replace for raid56, so we need kick that problem out before we enable that function for raid56. The fix method is very simple, we just increase the bio per-cpu counter before we submit a raid56 io, and decrease the counter when the raid56 io ends. Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Diffstat (limited to 'fs/btrfs/raid56.h')
-rw-r--r--fs/btrfs/raid56.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/raid56.h b/fs/btrfs/raid56.h
index 3d4ddb3d861d..31d4a157b5e3 100644
--- a/fs/btrfs/raid56.h
+++ b/fs/btrfs/raid56.h
@@ -43,8 +43,8 @@ struct btrfs_raid_bio;
struct btrfs_device;
int raid56_parity_recover(struct btrfs_root *root, struct bio *bio,
- struct btrfs_bio *bbio, u64 *raid_map,
- u64 stripe_len, int mirror_num, int hold_bbio);
+ struct btrfs_bio *bbio, u64 *raid_map,
+ u64 stripe_len, int mirror_num, int generic_io);
int raid56_parity_write(struct btrfs_root *root, struct bio *bio,
struct btrfs_bio *bbio, u64 *raid_map,
u64 stripe_len);
OpenPOWER on IntegriCloud