diff options
author | Tejun Heo <tj@kernel.org> | 2008-08-25 06:56:13 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 02:56:08 -0400 |
commit | eddb2e26b5ee3c5da68ba4bf1921ba20e2097bff (patch) | |
tree | 7a24f3f3cb577f344491dc57ea441060fac9d9a9 /include/linux/genhd.h | |
parent | 0762b8bde9729f10f8e6249809660ff2ec3ad735 (diff) |
block: kill GENHD_FL_FAIL and use part0->make_it_fail
GENHD_FL_FAIL for disk is what make_it_fail is for parts. Kill it and
use part0->make_it_fail. Sysfs node handling is unified too.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux/genhd.h')
-rw-r--r-- | include/linux/genhd.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 45a3682b5d87..3d15b42dc352 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -112,7 +112,6 @@ struct hd_struct { | |||
112 | #define GENHD_FL_CD 8 | 112 | #define GENHD_FL_CD 8 |
113 | #define GENHD_FL_UP 16 | 113 | #define GENHD_FL_UP 16 |
114 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 | 114 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 |
115 | #define GENHD_FL_FAIL 64 | ||
116 | 115 | ||
117 | struct gendisk { | 116 | struct gendisk { |
118 | /* major, first_minor, minors and ext_minors are input | 117 | /* major, first_minor, minors and ext_minors are input |
@@ -596,6 +595,13 @@ extern void blk_unregister_region(dev_t devt, unsigned long range); | |||
596 | 595 | ||
597 | extern ssize_t part_size_show(struct device *dev, | 596 | extern ssize_t part_size_show(struct device *dev, |
598 | struct device_attribute *attr, char *buf); | 597 | struct device_attribute *attr, char *buf); |
598 | #ifdef CONFIG_FAIL_MAKE_REQUEST | ||
599 | extern ssize_t part_fail_show(struct device *dev, | ||
600 | struct device_attribute *attr, char *buf); | ||
601 | extern ssize_t part_fail_store(struct device *dev, | ||
602 | struct device_attribute *attr, | ||
603 | const char *buf, size_t count); | ||
604 | #endif /* CONFIG_FAIL_MAKE_REQUEST */ | ||
599 | 605 | ||
600 | #else /* CONFIG_BLOCK */ | 606 | #else /* CONFIG_BLOCK */ |
601 | 607 | ||