1 files changed, 4 insertions, 19 deletions

diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 12731a19ef0..3b2f9cb8298 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -10,14 +10,13 @@
 
 #include <linux/percpu_counter.h>
 #include <linux/log2.h>
-#include <linux/flex_proportions.h>
+#include <linux/proportions.h>
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/writeback.h>
 #include <linux/atomic.h>
-#include <linux/sysctl.h>
 
 struct page;
 struct device;
@@ -41,7 +40,6 @@ typedef int (congested_fn)(void *, int);
 enum bdi_stat_item {
         BDI_RECLAIMABLE,
         BDI_WRITEBACK,
-        BDI_DIRTIED,
         BDI_WRITTEN,
         NR_BDI_STAT_ITEMS
 };
@@ -76,21 +74,11 @@ struct backing_dev_info {
         struct percpu_counter bdi_stat[NR_BDI_STAT_ITEMS];
 
         unsigned long bw_time_stamp;    /* last time write bw is updated */
-        unsigned long dirtied_stamp;
         unsigned long written_stamp;    /* pages written at bw_time_stamp */
         unsigned long write_bandwidth;  /* the estimated write bandwidth */
         unsigned long avg_write_bandwidth; /* further smoothed write bw */
 
-        /*
-         * The base dirty throttle rate, re-calculated on every 200ms.
-         * All the bdi tasks' dirty rate will be curbed under it.
-         * @dirty_ratelimit tracks the estimated @balanced_dirty_ratelimit
-         * in small steps and is much more smooth/stable than the latter.
-         */
-        unsigned long dirty_ratelimit;
-        unsigned long balanced_dirty_ratelimit;
-
-        struct fprop_local_percpu completions;
+        struct prop_local_percpu completions;
         int dirty_exceeded;
 
         unsigned int min_ratio;
@@ -114,17 +102,16 @@ struct backing_dev_info {
 int bdi_init(struct backing_dev_info *bdi);
 void bdi_destroy(struct backing_dev_info *bdi);
 
-__printf(3, 4)
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
                 const char *fmt, ...);
 int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
 void bdi_unregister(struct backing_dev_info *bdi);
 int bdi_setup_and_register(struct backing_dev_info *, char *, unsigned int);
-void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages,
-                        enum wb_reason reason);
+void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages);
 void bdi_start_background_writeback(struct backing_dev_info *bdi);
 int bdi_writeback_thread(void *data);
 int bdi_has_dirty_io(struct backing_dev_info *bdi);
+void bdi_arm_supers_timer(void);
 void bdi_wakeup_thread_delayed(struct backing_dev_info *bdi);
 void bdi_lock_two(struct bdi_writeback *wb1, struct bdi_writeback *wb2);
 
@@ -305,8 +292,6 @@ void clear_bdi_congested(struct backing_dev_info *bdi, int sync);
 void set_bdi_congested(struct backing_dev_info *bdi, int sync);
 long congestion_wait(int sync, long timeout);
 long wait_iff_congested(struct zone *zone, int sync, long timeout);
-int pdflush_proc_obsolete(struct ctl_table *table, int write,
-                void __user *buffer, size_t *lenp, loff_t *ppos);
 
 static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi)
 {