History

block: Remove unused functions

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

Jan Kara committed 9 years ago

Commit 2e82b841 parent c1844d52 files · +6 −55Browse files

Unified · Split

2 files
  1. include/linux/backing-dev.h +0 −5
  2. mm/backing-dev.c +6 −50
include/linux/backing-dev.h+0−5
@@ -17,8 +17,6 @@ · 16 unmodified lines
1717 #include <linux/backing-dev-defs.h>
1818 #include <linux/slab.h>
1919
20−int __must_check bdi_init(struct backing_dev_info *bdi);
21−
2220 static inline struct backing_dev_info *bdi_get(struct backing_dev_info *bdi)
2321 {
2422 kref_get(&bdi->refcnt);
@@ -32,12 +30,9 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, · 7 unmodified lines
3230 const char *fmt, ...);
3331 int bdi_register_va(struct backing_dev_info *bdi, struct device *parent,
3432 const char *fmt, va_list args);
35−int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
3633 int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner);
3734 void bdi_unregister(struct backing_dev_info *bdi);
3835
39−int __must_check bdi_setup_and_register(struct backing_dev_info *, char *);
40−void bdi_destroy(struct backing_dev_info *bdi);
4136 struct backing_dev_info *bdi_alloc_node(gfp_t gfp_mask, int node_id);
4237 static inline struct backing_dev_info *bdi_alloc(gfp_t gfp_mask)
4338 {
mm/backing-dev.c+6−50
@@ -12,8 +12,6 @@ · 11 unmodified lines
1212 #include <linux/device.h>
1313 #include <trace/events/writeback.h>
1414
15−static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
16−
1715 struct backing_dev_info noop_backing_dev_info = {
1816 .name = "noop",
1917 .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK,
@@ -242,6 +240,8 @@ static __init int bdi_class_init(void) · 222 unmodified lines
242240 }
243241 postcore_initcall(bdi_class_init);
244242
243+static int bdi_init(struct backing_dev_info *bdi);
244+
245245 static int __init default_bdi_init(void)
246246 {
247247 int err;
@@ -820,7 +820,7 @@ static void cgwb_remove_from_bdi_list(struct bdi_writeback *wb) · 572 unmodified lines
820820
821821 #endif /* CONFIG_CGROUP_WRITEBACK */
822822
823−int bdi_init(struct backing_dev_info *bdi)
823+static int bdi_init(struct backing_dev_info *bdi)
824824 {
825825 int ret;
826826
@@ -838,7 +838,6 @@ int bdi_init(struct backing_dev_info *bdi) · 11 unmodified lines
838838
839839 return ret;
840840 }
841−EXPORT_SYMBOL(bdi_init);
842841
843842 struct backing_dev_info *bdi_alloc_node(gfp_t gfp_mask, int node_id)
844843 {
@@ -897,12 +896,6 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, · 52 unmodified lines
897896 }
898897 EXPORT_SYMBOL(bdi_register);
899898
900−int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev)
901−{
902− return bdi_register(bdi, NULL, "%u:%u", MAJOR(dev), MINOR(dev));
903−}
904−EXPORT_SYMBOL(bdi_register_dev);
905−
906899 int bdi_register_owner(struct backing_dev_info *bdi, struct device *owner)
907900 {
908901 int rc;
@@ -950,13 +943,6 @@ void bdi_unregister(struct backing_dev_info *bdi) · 41 unmodified lines
950943 }
951944 }
952945
953−static void bdi_exit(struct backing_dev_info *bdi)
954−{
955− WARN_ON_ONCE(bdi->dev);
956− wb_exit(&bdi->wb);
957− cgwb_bdi_exit(bdi);
958−}
959−
960946 static void release_bdi(struct kref *ref)
961947 {
962948 struct backing_dev_info *bdi =
@@ -964,7 +950,9 @@ static void release_bdi(struct kref *ref) · 1 unmodified line
964950
965951 if (test_bit(WB_registered, &bdi->wb.state))
966952 bdi_unregister(bdi);
967− bdi_exit(bdi);
953+ WARN_ON_ONCE(bdi->dev);
954+ wb_exit(&bdi->wb);
955+ cgwb_bdi_exit(bdi);
968956 kfree(bdi);
969957 }
970958
@@ -974,38 +962,6 @@ void bdi_put(struct backing_dev_info *bdi) · 3 unmodified lines
974962 }
975963 EXPORT_SYMBOL(bdi_put);
976964
977−void bdi_destroy(struct backing_dev_info *bdi)
978−{
979− bdi_unregister(bdi);
980− bdi_exit(bdi);
981−}
982−EXPORT_SYMBOL(bdi_destroy);
983−
984−/*
985− * For use from filesystems to quickly init and register a bdi associated
986− * with dirty writeback
987− */
988−int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
989−{
990− int err;
991−
992− bdi->name = name;
993− bdi->capabilities = 0;
994− err = bdi_init(bdi);
995− if (err)
996− return err;
997−
998− err = bdi_register(bdi, NULL, "%.28s-%ld", name,
999− atomic_long_inc_return(&bdi_seq));
1000− if (err) {
1001− bdi_destroy(bdi);
1002− return err;
1003− }
1004−
1005− return 0;
1006−}
1007−EXPORT_SYMBOL(bdi_setup_and_register);
1008−
1009965 static wait_queue_head_t congestion_wqh[2] = {
1010966 __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]),
1011967 __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1])

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t