bdi: remove the name field in struct backing_dev_info

The name is only printed for a not registered bdi in writeback.  Use the
device name there as is more useful anyway for the unlike case that the
warning triggers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-core.c b/block/blk-core.c
index 285a2f8..538cbc7 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -511,7 +511,6 @@ struct request_queue *__blk_alloc_queue(int node_id)
 
        q->backing_dev_info->ra_pages = VM_READAHEAD_PAGES;
        q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;
-       q->backing_dev_info->name = "block";
        q->node = node_id;
 
        timer_setup(&q->backing_dev_info->laptop_mode_wb_timer,

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 39ec563..fcb018c 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -2040,7 +2040,6 @@ static struct backing_dev_info * __init mtd_bdi_init(char *name)
        if (!bdi)
                return ERR_PTR(-ENOMEM);
 
-       bdi->name = name;
        /*
         * We put '-0' suffix to the name to get the same name format as we
         * used to get. Since this is called only once, we get a unique name. 

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 76ac9c7..d853236 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -2320,7 +2320,7 @@ void __mark_inode_dirty(struct inode *inode, int flags)
 
                        WARN(bdi_cap_writeback_dirty(wb->bdi) &&
                             !test_bit(WB_registered, &wb->state),
-                            "bdi-%s not registered\n", wb->bdi->name);
+                            "bdi-%s not registered\n", bdi_dev_name(wb->bdi));
 
                        inode->dirtied_when = jiffies;
                        if (dirtytime)

diff --git a/fs/super.c b/fs/super.c
index dd28fcd..4991f44 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1602,8 +1602,6 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...)
        if (!bdi)
                return -ENOMEM;
 
-       bdi->name = sb->s_type->name;
-
        va_start(args, fmt);
        err = bdi_register_va(bdi, fmt, args);
        va_end(args);

diff --git a/include/linux/backing-dev-defs.h b/include/linux/backing-dev-defs.h
index 7367150..90a7e84 100644 (file)
--- a/include/linux/backing-dev-defs.h
+++ b/include/linux/backing-dev-defs.h
@@ -193,8 +193,6 @@ struct backing_dev_info {
        congested_fn *congested_fn; /* Function pointer if device is md/dm */
        void *congested_data;   /* Pointer to aux data for congested func */
 
-       const char *name;
-
        struct kref refcnt;     /* Reference counter for the structure */
        unsigned int capabilities; /* Device capabilities */
        unsigned int min_ratio;

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 1f55d5b..d382272 100644 (file)
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -15,7 +15,6 @@
 #include <trace/events/writeback.h>
 
 struct backing_dev_info noop_backing_dev_info = {
-       .name           = "noop",
        .capabilities   = BDI_CAP_NO_ACCT_AND_WRITEBACK,
 };
 EXPORT_SYMBOL_GPL(noop_backing_dev_info);