bdev: move ->bd_make_it_fail to ->__bd_flags

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 1be49be9fac4d1ea4c18e730f3108c08d25329d1..1076336dd62076fb40e81fc8c8583eb762ef9f5e 100644 (file)
--- 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 19cd1a31fa807411f19886b74b34aa4e3195baf5..0cce461952f60d84eba5c959135568f718d8962a 100644 (file)
--- 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 4e0c8785090c2b708d9535c945e7e627466d107c..5bb7805927ac14cafcda860ae35e044be56698ed 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -51,6 +51,9 @@ struct block_device {
 #define BD_WRITE_HOLDER                (1u<<9)
 #define BD_HAS_SUBMIT_BIO      (1u<<10)
 #define BD_RO_WARNED           (1u<<11)
+#ifdef CONFIG_FAIL_MAKE_REQUEST
+#define BD_MAKE_IT_FAIL                (1u<<12)
+#endif
        dev_t                   bd_dev;
        struct inode            *bd_inode;      /* will die */
 
@@ -67,9 +70,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