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

block: Remove unused functions

Now that all backing_dev_info structure are allocated separately, we can
drop some unused functions.

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
2e82b84c c1844d53

+6 -55
-5
include/linux/backing-dev.h
··· 17 17 #include <linux/backing-dev-defs.h> 18 18 #include <linux/slab.h> 19 19 20 - int __must_check bdi_init(struct backing_dev_info *bdi); 21 - 22 20 static inline struct backing_dev_info *bdi_get(struct backing_dev_info *bdi) 23 21 { 24 22 kref_get(&bdi->refcnt); ··· 30 32 const char *fmt, ...); 31 33 int bdi_register_va(struct backing_dev_info *bdi, struct device *parent, 32 34 const char *fmt, va_list args); 33 - int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev); 34 35 int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner); 35 36 void bdi_unregister(struct backing_dev_info *bdi); 36 37 37 - int __must_check bdi_setup_and_register(struct backing_dev_info *, char *); 38 - void bdi_destroy(struct backing_dev_info *bdi); 39 38 struct backing_dev_info *bdi_alloc_node(gfp_t gfp_mask, int node_id); 40 39 static inline struct backing_dev_info *bdi_alloc(gfp_t gfp_mask) 41 40 {
+6 -50
mm/backing-dev.c
··· 12 12 #include <linux/device.h> 13 13 #include <trace/events/writeback.h> 14 14 15 - static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0); 16 - 17 15 struct backing_dev_info noop_backing_dev_info = { 18 16 .name = "noop", 19 17 .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, ··· 239 241 return 0; 240 242 } 241 243 postcore_initcall(bdi_class_init); 244 + 245 + static int bdi_init(struct backing_dev_info *bdi); 242 246 243 247 static int __init default_bdi_init(void) 244 248 { ··· 820 820 821 821 #endif /* CONFIG_CGROUP_WRITEBACK */ 822 822 823 - int bdi_init(struct backing_dev_info *bdi) 823 + static int bdi_init(struct backing_dev_info *bdi) 824 824 { 825 825 int ret; 826 826 ··· 838 838 839 839 return ret; 840 840 } 841 - EXPORT_SYMBOL(bdi_init); 842 841 843 842 struct backing_dev_info *bdi_alloc_node(gfp_t gfp_mask, int node_id) 844 843 { ··· 896 897 } 897 898 EXPORT_SYMBOL(bdi_register); 898 899 899 - int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev) 900 - { 901 - return bdi_register(bdi, NULL, "%u:%u", MAJOR(dev), MINOR(dev)); 902 - } 903 - EXPORT_SYMBOL(bdi_register_dev); 904 - 905 900 int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner) 906 901 { 907 902 int rc; ··· 943 950 } 944 951 } 945 952 946 - static void bdi_exit(struct backing_dev_info *bdi) 947 - { 948 - WARN_ON_ONCE(bdi->dev); 949 - wb_exit(&bdi->wb); 950 - cgwb_bdi_exit(bdi); 951 - } 952 - 953 953 static void release_bdi(struct kref *ref) 954 954 { 955 955 struct backing_dev_info *bdi = ··· 950 964 951 965 if (test_bit(WB_registered, &bdi->wb.state)) 952 966 bdi_unregister(bdi); 953 - bdi_exit(bdi); 967 + WARN_ON_ONCE(bdi->dev); 968 + wb_exit(&bdi->wb); 969 + cgwb_bdi_exit(bdi); 954 970 kfree(bdi); 955 971 } 956 972 ··· 961 973 kref_put(&bdi->refcnt, release_bdi); 962 974 } 963 975 EXPORT_SYMBOL(bdi_put); 964 - 965 - void bdi_destroy(struct backing_dev_info *bdi) 966 - { 967 - bdi_unregister(bdi); 968 - bdi_exit(bdi); 969 - } 970 - EXPORT_SYMBOL(bdi_destroy); 971 - 972 - /* 973 - * For use from filesystems to quickly init and register a bdi associated 974 - * with dirty writeback 975 - */ 976 - int bdi_setup_and_register(struct backing_dev_info *bdi, char *name) 977 - { 978 - int err; 979 - 980 - bdi->name = name; 981 - bdi->capabilities = 0; 982 - err = bdi_init(bdi); 983 - if (err) 984 - return err; 985 - 986 - err = bdi_register(bdi, NULL, "%.28s-%ld", name, 987 - atomic_long_inc_return(&bdi_seq)); 988 - if (err) { 989 - bdi_destroy(bdi); 990 - return err; 991 - } 992 - 993 - return 0; 994 - } 995 - EXPORT_SYMBOL(bdi_setup_and_register); 996 976 997 977 static wait_queue_head_t congestion_wqh[2] = { 998 978 __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]),