summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-11-23 18:28:47 +0300
committerJens Axboe <axboe@kernel.dk>2020-12-02 00:53:40 +0300
commitb309e9936347232c724eaa13f70533128b4864e9 (patch)
tree605597177f339d9934dfdfa7f25a0a947fd356e7 /include/linux
parent1bdd5ae0251d678488dffcf455d4633c2beef1bc (diff)
downloadlinux-b309e9936347232c724eaa13f70533128b4864e9.tar.xz
block: move make_it_fail to struct block_device
Move the make_it_fail flag to struct block_device an turn it into a bool in preparation of killing struct hd_struct. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk_types.h3
-rw-r--r--include/linux/genhd.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index c0591e52d7d7..b237f1e40814 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -52,6 +52,9 @@ struct block_device {
struct super_block *bd_fsfreeze_sb;
struct partition_meta_info *bd_meta_info;
+#ifdef CONFIG_FAIL_MAKE_REQUEST
+ bool bd_make_it_fail;
+#endif
} __randomize_layout;
#define bdev_whole(_bdev) \
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index b4a5c05593b9..349cf6403ccd 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -56,9 +56,6 @@ struct hd_struct {
struct block_device *bdev;
struct device __dev;
int policy, partno;
-#ifdef CONFIG_FAIL_MAKE_REQUEST
- int make_it_fail;
-#endif
struct rcu_work rcu_work;
};