block: untangle request_queue refcounting from sysfs

[linux-block.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 516e45246868a88d8608506d98b9f25d1e9d653f..469299ea0660e04be8e73871c62c0d084897df61 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -155,6 +155,7 @@ struct gendisk {
        unsigned open_partitions;       /* number of open partitions */
 
        struct backing_dev_info *bdi;
+       struct kobject queue_kobj;      /* the queue/ directory */
        struct kobject *slave_dir;
 #ifdef CONFIG_BLOCK_HOLDER_DEPRECATED
        struct list_head slave_bdevs;
@@ -430,10 +431,7 @@ struct request_queue {
 
        struct gendisk          *disk;
 
-       /*
-        * queue kobject
-        */
-       struct kobject kobj;
+       refcount_t              refs;
 
        /*
         * mq queue kobject