Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jan Kara and committed by
Jens Axboe
7c4cc300 2e82b84c

+11 -15
+1 -1
drivers/mtd/mtdcore.c
··· 1782 1782 * We put '-0' suffix to the name to get the same name format as we 1783 1783 * used to get. Since this is called only once, we get a unique name. 1784 1784 */ 1785 - ret = bdi_register(bdi, NULL, "%.28s-0", name); 1785 + ret = bdi_register(bdi, "%.28s-0", name); 1786 1786 if (ret) 1787 1787 bdi_put(bdi); 1788 1788
+1 -1
fs/super.c
··· 1272 1272 bdi->name = sb->s_type->name; 1273 1273 1274 1274 va_start(args, fmt); 1275 - err = bdi_register_va(bdi, NULL, fmt, args); 1275 + err = bdi_register_va(bdi, fmt, args); 1276 1276 va_end(args); 1277 1277 if (err) { 1278 1278 bdi_put(bdi);
+4 -5
include/linux/backing-dev.h
··· 25 25 26 26 void bdi_put(struct backing_dev_info *bdi); 27 27 28 - __printf(3, 4) 29 - int bdi_register(struct backing_dev_info *bdi, struct device *parent, 30 - const char *fmt, ...); 31 - int bdi_register_va(struct backing_dev_info *bdi, struct device *parent, 32 - const char *fmt, va_list args); 28 + __printf(2, 3) 29 + int bdi_register(struct backing_dev_info *bdi, const char *fmt, ...); 30 + int bdi_register_va(struct backing_dev_info *bdi, const char *fmt, 31 + va_list args); 33 32 int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner); 34 33 void bdi_unregister(struct backing_dev_info *bdi); 35 34
+5 -8
mm/backing-dev.c
··· 856 856 } 857 857 EXPORT_SYMBOL(bdi_alloc_node); 858 858 859 - int bdi_register_va(struct backing_dev_info *bdi, struct device *parent, 860 - const char *fmt, va_list args) 859 + int bdi_register_va(struct backing_dev_info *bdi, const char *fmt, va_list args) 861 860 { 862 861 struct device *dev; 863 862 864 863 if (bdi->dev) /* The driver needs to use separate queues per device */ 865 864 return 0; 866 865 867 - dev = device_create_vargs(bdi_class, parent, MKDEV(0, 0), bdi, fmt, args); 866 + dev = device_create_vargs(bdi_class, NULL, MKDEV(0, 0), bdi, fmt, args); 868 867 if (IS_ERR(dev)) 869 868 return PTR_ERR(dev); 870 869 ··· 882 883 } 883 884 EXPORT_SYMBOL(bdi_register_va); 884 885 885 - int bdi_register(struct backing_dev_info *bdi, struct device *parent, 886 - const char *fmt, ...) 886 + int bdi_register(struct backing_dev_info *bdi, const char *fmt, ...) 887 887 { 888 888 va_list args; 889 889 int ret; 890 890 891 891 va_start(args, fmt); 892 - ret = bdi_register_va(bdi, parent, fmt, args); 892 + ret = bdi_register_va(bdi, fmt, args); 893 893 va_end(args); 894 894 return ret; 895 895 } ··· 898 900 { 899 901 int rc; 900 902 901 - rc = bdi_register(bdi, NULL, "%u:%u", MAJOR(owner->devt), 902 - MINOR(owner->devt)); 903 + rc = bdi_register(bdi, "%u:%u", MAJOR(owner->devt), MINOR(owner->devt)); 903 904 if (rc) 904 905 return rc; 905 906 /* Leaking owner reference... */