mirror of
https://github.com/torvalds/linux
synced 2024-07-21 10:35:42 +00:00
bdev: move ->bd_make_it_fail to ->__bd_flags
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
49a43dae93
commit
811ba89a88
|
@ -494,7 +494,8 @@ __setup("fail_make_request=", setup_fail_make_request);
|
||||||
|
|
||||||
bool should_fail_request(struct block_device *part, unsigned int bytes)
|
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)
|
static int __init fail_make_request_debugfs(void)
|
||||||
|
|
|
@ -1066,7 +1066,8 @@ static DEVICE_ATTR(diskseq, 0444, diskseq_show, NULL);
|
||||||
ssize_t part_fail_show(struct device *dev,
|
ssize_t part_fail_show(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
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,
|
ssize_t part_fail_store(struct device *dev,
|
||||||
|
@ -1075,9 +1076,12 @@ ssize_t part_fail_store(struct device *dev,
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (count > 0 && sscanf(buf, "%d", &i) > 0)
|
if (count > 0 && sscanf(buf, "%d", &i) > 0) {
|
||||||
dev_to_bdev(dev)->bd_make_it_fail = i;
|
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;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -51,6 +51,9 @@ struct block_device {
|
||||||
#define BD_WRITE_HOLDER (1u<<9)
|
#define BD_WRITE_HOLDER (1u<<9)
|
||||||
#define BD_HAS_SUBMIT_BIO (1u<<10)
|
#define BD_HAS_SUBMIT_BIO (1u<<10)
|
||||||
#define BD_RO_WARNED (1u<<11)
|
#define BD_RO_WARNED (1u<<11)
|
||||||
|
#ifdef CONFIG_FAIL_MAKE_REQUEST
|
||||||
|
#define BD_MAKE_IT_FAIL (1u<<12)
|
||||||
|
#endif
|
||||||
dev_t bd_dev;
|
dev_t bd_dev;
|
||||||
struct inode *bd_inode; /* will die */
|
struct inode *bd_inode; /* will die */
|
||||||
|
|
||||||
|
@ -67,9 +70,6 @@ struct block_device {
|
||||||
struct mutex bd_fsfreeze_mutex; /* serialize freeze/thaw */
|
struct mutex bd_fsfreeze_mutex; /* serialize freeze/thaw */
|
||||||
|
|
||||||
struct partition_meta_info *bd_meta_info;
|
struct partition_meta_info *bd_meta_info;
|
||||||
#ifdef CONFIG_FAIL_MAKE_REQUEST
|
|
||||||
bool bd_make_it_fail;
|
|
||||||
#endif
|
|
||||||
int bd_writers;
|
int bd_writers;
|
||||||
/*
|
/*
|
||||||
* keep this out-of-line as it's both big and not needed in the fast
|
* keep this out-of-line as it's both big and not needed in the fast
|
||||||
|
|
Loading…
Reference in a new issue