From: Jan Kara <jack@suse.cz>
To: <linux-fsdevel@vger.kernel.org>
Cc: linux-block@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>, Jan Kara <jack@suse.cz>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
linux-mtd@lists.infradead.org
Subject: [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure
Date: Wed, 29 Mar 2017 12:56:11 +0200 [thread overview]
Message-ID: <20170329105623.18241-14-jack@suse.cz> (raw)
In-Reply-To: <20170329105623.18241-1-jack@suse.cz>
MTD already allocates backing_dev_info dynamically. Convert it to use
generic infrastructure for this including proper refcounting. We drop
mtd->backing_dev_info as its only use was to pass mtd_bdi pointer from
one file into another and if we wanted to keep that in a clean way, we'd
have to make mtd hold and drop bdi reference as needed which seems
pointless for passing one global pointer...
CC: David Woodhouse <dwmw2@infradead.org>
CC: Brian Norris <computersforpeace@gmail.com>
CC: linux-mtd@lists.infradead.org
Signed-off-by: Jan Kara <jack@suse.cz>
---
drivers/mtd/mtdcore.c | 23 ++++++++++++-----------
drivers/mtd/mtdsuper.c | 7 ++++++-
include/linux/mtd/mtd.h | 5 -----
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 66a9dedd1062..23e2e56ca54e 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -46,7 +46,7 @@
#include "mtdcore.h"
-static struct backing_dev_info *mtd_bdi;
+struct backing_dev_info *mtd_bdi;
#ifdef CONFIG_PM_SLEEP
@@ -496,11 +496,9 @@ int add_mtd_device(struct mtd_info *mtd)
* mtd_device_parse_register() multiple times on the same master MTD,
* especially with CONFIG_MTD_PARTITIONED_MASTER=y.
*/
- if (WARN_ONCE(mtd->backing_dev_info, "MTD already registered\n"))
+ if (WARN_ONCE(mtd->dev.type, "MTD already registered\n"))
return -EEXIST;
- mtd->backing_dev_info = mtd_bdi;
-
BUG_ON(mtd->writesize == 0);
mutex_lock(&mtd_table_mutex);
@@ -1775,13 +1773,18 @@ static struct backing_dev_info * __init mtd_bdi_init(char *name)
struct backing_dev_info *bdi;
int ret;
- bdi = kzalloc(sizeof(*bdi), GFP_KERNEL);
+ bdi = bdi_alloc(GFP_KERNEL);
if (!bdi)
return ERR_PTR(-ENOMEM);
- ret = bdi_setup_and_register(bdi, name);
+ 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.
+ */
+ ret = bdi_register(bdi, NULL, "%.28s-0", name);
if (ret)
- kfree(bdi);
+ bdi_put(bdi);
return ret ? ERR_PTR(ret) : bdi;
}
@@ -1813,8 +1816,7 @@ static int __init init_mtd(void)
out_procfs:
if (proc_mtd)
remove_proc_entry("mtd", NULL);
- bdi_destroy(mtd_bdi);
- kfree(mtd_bdi);
+ bdi_put(mtd_bdi);
err_bdi:
class_unregister(&mtd_class);
err_reg:
@@ -1828,8 +1830,7 @@ static void __exit cleanup_mtd(void)
if (proc_mtd)
remove_proc_entry("mtd", NULL);
class_unregister(&mtd_class);
- bdi_destroy(mtd_bdi);
- kfree(mtd_bdi);
+ bdi_put(mtd_bdi);
idr_destroy(&mtd_idr);
}
diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c
index 20c02a3b7417..e69e7855e31f 100644
--- a/drivers/mtd/mtdsuper.c
+++ b/drivers/mtd/mtdsuper.c
@@ -18,6 +18,7 @@
#include <linux/ctype.h>
#include <linux/slab.h>
#include <linux/major.h>
+#include <linux/backing-dev.h>
/*
* compare superblocks to see if they're equivalent
@@ -38,6 +39,8 @@ static int get_sb_mtd_compare(struct super_block *sb, void *_mtd)
return 0;
}
+extern struct backing_dev_info *mtd_bdi;
+
/*
* mark the superblock by the MTD device it is using
* - set the device number to be the correct MTD block device for pesuperstence
@@ -49,7 +52,9 @@ static int get_sb_mtd_set(struct super_block *sb, void *_mtd)
sb->s_mtd = mtd;
sb->s_dev = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
- sb->s_bdi = mtd->backing_dev_info;
+ sb->s_bdi = bdi_get(mtd_bdi);
+ sb->s_iflags |= SB_I_DYNBDI;
+
return 0;
}
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index eebdc63cf6af..79b176eca04a 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -334,11 +334,6 @@ struct mtd_info {
int (*_get_device) (struct mtd_info *mtd);
void (*_put_device) (struct mtd_info *mtd);
- /* Backing device capabilities for this device
- * - provides mmap capabilities
- */
- struct backing_dev_info *backing_dev_info;
-
struct notifier_block reboot_notifier; /* default mode before reboot */
/* ECC status information */
--
2.10.2
next prev parent reply other threads:[~2017-03-29 10:56 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 10:55 [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara
2017-03-29 10:55 ` [PATCH 01/25] bdi: Provide bdi_register_va() and bdi_alloc() Jan Kara
2017-04-12 8:06 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 02/25] block: Unregister bdi on last reference drop Jan Kara
2017-04-12 8:06 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 03/25] bdi: Export bdi_alloc_node() and bdi_put() Jan Kara
2017-04-12 8:08 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 04/25] fs: Provide infrastructure for dynamic BDIs in filesystems Jan Kara
2017-04-12 8:09 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 05/25] fs: Get proper reference for s_bdi Jan Kara
2017-04-12 8:09 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 06/25] lustre: Convert to separately allocated bdi Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 07/25] 9p: " Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 08/25] btrfs: " Jan Kara
2017-04-12 8:10 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 09/25] ceph: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 10/25] cifs: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 11/25] ecryptfs: " Jan Kara
2017-04-12 8:11 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 12/25] afs: " Jan Kara
2017-04-12 8:12 ` Christoph Hellwig
2017-03-29 10:56 ` Jan Kara [this message]
2017-04-12 8:14 ` [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure Christoph Hellwig
2017-04-12 9:43 ` Jan Kara
2017-03-29 10:56 ` [PATCH 14/25] coda: Convert to separately allocated bdi Jan Kara
2017-04-12 8:14 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 15/25] exofs: " Jan Kara
2017-04-12 8:14 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 16/25] fuse: " Jan Kara
2017-04-12 8:15 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 17/25] fuse: Get rid of bdi_initialized Jan Kara
2017-04-12 8:15 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 18/25] gfs2: Convert to properly refcounting bdi Jan Kara
2017-04-12 8:16 ` Christoph Hellwig
2017-04-12 8:48 ` Steven Whitehouse
2017-03-29 10:56 ` [PATCH 19/25] nilfs2: " Jan Kara
2017-04-12 8:17 ` Christoph Hellwig
2017-04-12 9:33 ` Jan Kara
2017-03-29 10:56 ` [PATCH 20/25] ncpfs: Convert to separately allocated bdi Jan Kara
2017-04-12 8:18 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 21/25] nfs: " Jan Kara
2017-04-12 8:20 ` Christoph Hellwig
2017-04-12 9:52 ` Jan Kara
2017-03-29 10:56 ` [PATCH 22/25] ubifs: " Jan Kara
2017-04-12 8:20 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 23/25] fs: Remove SB_I_DYNBDI flag Jan Kara
2017-04-12 8:21 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 24/25] block: Remove unused functions Jan Kara
2017-04-12 8:21 ` Christoph Hellwig
2017-03-29 10:56 ` [PATCH 25/25] bdi: Drop 'parent' argument from bdi_register[_va]() Jan Kara
2017-04-12 8:21 ` Christoph Hellwig
2017-04-12 7:32 ` [PATCH 0/25 v2] fs: Convert all embedded bdis into separate ones Jan Kara
2017-04-12 10:24 [PATCH 0/25 v3] " Jan Kara
2017-04-12 10:24 ` [PATCH 13/25] mtd: Convert to dynamically allocated bdi infrastructure Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170329105623.18241-14-jack@suse.cz \
--to=jack@suse.cz \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).