p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdi: Drop 'parent' argument from bdi_register[_va]() 

Drop 'parent' argument of bdi_register() and bdi_register_va().  It is
always NULL.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jan Kara 2017-04-12 12:24:49 +02:00 committed by Jens Axboe
parent 2e82b84c01
commit 7c4cc30024
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/mtdcore.c
View File

@ -1782,7 +1782,7 @@ static struct backing_dev_info * __init mtd_bdi_init(char *name)
* We put '-0' suffix to the name to get the same name format as we * 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. * used to get. Since this is called only once, we get a unique name.
*/ */
ret = bdi_register(bdi, NULL, "%.28s-0", name); ret = bdi_register(bdi, "%.28s-0", name);
if (ret) if (ret)
bdi_put(bdi); bdi_put(bdi);

2
fs/super.c
View File

@ -1272,7 +1272,7 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...)
bdi->name = sb->s_type->name; bdi->name = sb->s_type->name;
va_start(args, fmt); va_start(args, fmt);
err = bdi_register_va(bdi, NULL, fmt, args); err = bdi_register_va(bdi, fmt, args);
va_end(args); va_end(args);
if (err) { if (err) {
bdi_put(bdi); bdi_put(bdi);

9
include/linux/backing-dev.h
View File

@ -25,11 +25,10 @@ static inline struct backing_dev_info *bdi_get(struct backing_dev_info *bdi)
void bdi_put(struct backing_dev_info *bdi); void bdi_put(struct backing_dev_info *bdi);
__printf(3, 4) __printf(2, 3)
int bdi_register(struct backing_dev_info *bdi, struct device *parent, int bdi_register(struct backing_dev_info *bdi, const char *fmt, ...);
const char *fmt, ...); int bdi_register_va(struct backing_dev_info *bdi, const char *fmt,
int bdi_register_va(struct backing_dev_info *bdi, struct device *parent, va_list args);
const char *fmt, va_list args);
int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner); int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner);
void bdi_unregister(struct backing_dev_info *bdi); void bdi_unregister(struct backing_dev_info *bdi);

13
mm/backing-dev.c
View File

@ -856,15 +856,14 @@ struct backing_dev_info *bdi_alloc_node(gfp_t gfp_mask, int node_id)
} }
EXPORT_SYMBOL(bdi_alloc_node); EXPORT_SYMBOL(bdi_alloc_node);
int bdi_register_va(struct backing_dev_info *bdi, struct device *parent, int bdi_register_va(struct backing_dev_info *bdi, const char *fmt, va_list args)
const char *fmt, va_list args)
{ {
struct device *dev; struct device *dev;
if (bdi->dev) /* The driver needs to use separate queues per device */ if (bdi->dev) /* The driver needs to use separate queues per device */
return 0; return 0;
dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); dev = device_create_vargs(bdi_class, NULL, MKDEV(0, 0), bdi, fmt, args);
if (IS_ERR(dev)) if (IS_ERR(dev))
return PTR_ERR(dev); return PTR_ERR(dev);
@ -883,14 +882,13 @@ int bdi_register_va(struct backing_dev_info *bdi, struct device *parent,
} }
EXPORT_SYMBOL(bdi_register_va); EXPORT_SYMBOL(bdi_register_va);
int bdi_register(struct backing_dev_info *bdi, struct device *parent, int bdi_register(struct backing_dev_info *bdi, const char *fmt, ...)
const char *fmt, ...)
{ {
va_list args; va_list args;
int ret; int ret;
va_start(args, fmt); va_start(args, fmt);
ret = bdi_register_va(bdi, parent, fmt, args); ret = bdi_register_va(bdi, fmt, args);
va_end(args); va_end(args);
return ret; return ret;
} }
@ -900,8 +898,7 @@ int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner)
{ {
int rc; int rc;
rc = bdi_register(bdi, NULL, "%u:%u", MAJOR(owner->devt), rc = bdi_register(bdi, "%u:%u", MAJOR(owner->devt), MINOR(owner->devt));
MINOR(owner->devt));
if (rc) if (rc)
return rc; return rc;
/* Leaking owner reference... */ /* Leaking owner reference... */