Merge tag 'pull-bd_flags-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[thirdparty/kernel/linux.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 0519097afa3533646fb6930772f385b35c717f93..8f1f3c6b4d6729f1540750af7955a7344720f5d1 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -411,7 +411,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
        elevator_init_mq(disk->queue);
 
        /* Mark bdev as having a submit_bio, if needed */
-       disk->part0->bd_has_submit_bio = disk->fops->submit_bio != NULL;
+       if (disk->fops->submit_bio)
+               bdev_set_flag(disk->part0, BD_HAS_SUBMIT_BIO);
 
        /*
         * If the driver provides an explicit major number it also must provide
@@ -1064,7 +1065,8 @@ static DEVICE_ATTR(partscan, 0444, partscan_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,
@@ -1073,9 +1075,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;
 }