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>

1 files changed, 3 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index a4a7c08d2f20..505ec61067df 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1273,8 +1273,9 @@ __setup("fail_make_request=", setup_fail_make_request);
 
 static int should_fail_request(struct bio *bio)
 {
-        if ((bio->bi_bdev->bd_disk->flags & GENHD_FL_FAIL) ||
-            bio->bi_bdev->bd_part->make_it_fail)
+        struct hd_struct *part = bio->bi_bdev->bd_part;
+
+        if (part_to_disk(part)->part0.make_it_fail || part->make_it_fail)
                 return should_fail(&fail_make_request, bio->bi_size);
 
         return 0;