diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2024-04-28 00:15:07 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2024-04-28 01:09:03 -0400 |
| commit | c080e089a77ed0207afdbc7f6a0c0741253e8e59 (patch) | |
| tree | 10fc4327142abbe0f44bbc2c0da4be1b1f0e1770 | |
| parent | 801be5eb0ca12e2e991774056e5cc72b828d2507 (diff) | |
| download | vfs-work.bd_flags.tar.gz | |
bdev: move ->bd_make_it_fail to ->__bd_flagswork.bd_flags
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | block/blk-core.c | 3 | ||||
| -rw-r--r-- | block/genhd.c | 12 | ||||
| -rw-r--r-- | include/linux/blk_types.h | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 1be49be9fac4d..1076336dd6207 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -494,7 +494,8 @@ __setup("fail_make_request=", setup_fail_make_request); bool should_fail_request(struct block_device *part, unsigned int bytes) { - return part->bd_make_it_fail && should_fail(&fail_make_request, bytes); + return bdev_test_flag(part, BD_MAKE_IT_FAIL) && + should_fail(&fail_make_request, bytes); } static int __init fail_make_request_debugfs(void) diff --git a/block/genhd.c b/block/genhd.c index 19cd1a31fa807..0cce461952f60 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1066,7 +1066,8 @@ static DEVICE_ATTR(diskseq, 0444, diskseq_show, NULL); ssize_t part_fail_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "%d\n", dev_to_bdev(dev)->bd_make_it_fail); + return sprintf(buf, "%d\n", + bdev_test_flag(dev_to_bdev(dev), BD_MAKE_IT_FAIL)); } ssize_t part_fail_store(struct device *dev, @@ -1075,9 +1076,12 @@ ssize_t part_fail_store(struct device *dev, { int i; - if (count > 0 && sscanf(buf, "%d", &i) > 0) - dev_to_bdev(dev)->bd_make_it_fail = i; - + if (count > 0 && sscanf(buf, "%d", &i) > 0) { + if (i) + bdev_set_flag(dev_to_bdev(dev), BD_MAKE_IT_FAIL); + else + bdev_clear_flag(dev_to_bdev(dev), BD_MAKE_IT_FAIL); + } return count; } diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 59de93913cc4d..98e1c2d28d60e 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -62,9 +62,6 @@ struct block_device { struct mutex bd_fsfreeze_mutex; /* serialize freeze/thaw */ struct partition_meta_info *bd_meta_info; -#ifdef CONFIG_FAIL_MAKE_REQUEST - bool bd_make_it_fail; -#endif int bd_writers; /* * keep this out-of-line as it's both big and not needed in the fast @@ -87,6 +84,9 @@ enum { BD_WRITE_HOLDER, BD_HAS_SUBMIT_BIO, BD_RO_WARNED, +#ifdef CONFIG_FAIL_MAKE_REQUEST + BD_MAKE_IT_FAIL, +#endif }; /* |