aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/writeback.h4
-rw-r--r--mm/backing-dev.c6
-rw-r--r--mm/page-writeback.c22
3 files changed, 16 insertions, 16 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index e585657e9831..259e9ea58cab 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -125,8 +125,8 @@ struct file;
125int dirty_writeback_centisecs_handler(struct ctl_table *, int, struct file *, 125int dirty_writeback_centisecs_handler(struct ctl_table *, int, struct file *,
126 void __user *, size_t *, loff_t *); 126 void __user *, size_t *, loff_t *);
127 127
128void get_dirty_limits(long *pbackground, long *pdirty, long *pbdi_dirty, 128void get_dirty_limits(unsigned long *pbackground, unsigned long *pdirty,
129 struct backing_dev_info *bdi); 129 unsigned long *pbdi_dirty, struct backing_dev_info *bdi);
130 130
131void page_writeback_init(void); 131void page_writeback_init(void);
132void balance_dirty_pages_ratelimited_nr(struct address_space *mapping, 132void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 801c08b046e6..6f80beddd8a4 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -24,9 +24,9 @@ static void bdi_debug_init(void)
24static int bdi_debug_stats_show(struct seq_file *m, void *v) 24static int bdi_debug_stats_show(struct seq_file *m, void *v)
25{ 25{
26 struct backing_dev_info *bdi = m->private; 26 struct backing_dev_info *bdi = m->private;
27 long background_thresh; 27 unsigned long background_thresh;
28 long dirty_thresh; 28 unsigned long dirty_thresh;
29 long bdi_thresh; 29 unsigned long bdi_thresh;
30 30
31 get_dirty_limits(&background_thresh, &dirty_thresh, &bdi_thresh, bdi); 31 get_dirty_limits(&background_thresh, &dirty_thresh, &bdi_thresh, bdi);
32 32
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 08d2b960b294..4d4074cff300 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -362,13 +362,13 @@ unsigned long determine_dirtyable_memory(void)
362} 362}
363 363
364void 364void
365get_dirty_limits(long *pbackground, long *pdirty, long *pbdi_dirty, 365get_dirty_limits(unsigned long *pbackground, unsigned long *pdirty,
366 struct backing_dev_info *bdi) 366 unsigned long *pbdi_dirty, struct backing_dev_info *bdi)
367{ 367{
368 int background_ratio; /* Percentages */ 368 int background_ratio; /* Percentages */
369 int dirty_ratio; 369 int dirty_ratio;
370 long background; 370 unsigned long background;
371 long dirty; 371 unsigned long dirty;
372 unsigned long available_memory = determine_dirtyable_memory(); 372 unsigned long available_memory = determine_dirtyable_memory();
373 struct task_struct *tsk; 373 struct task_struct *tsk;
374 374
@@ -423,9 +423,9 @@ static void balance_dirty_pages(struct address_space *mapping)
423{ 423{
424 long nr_reclaimable, bdi_nr_reclaimable; 424 long nr_reclaimable, bdi_nr_reclaimable;
425 long nr_writeback, bdi_nr_writeback; 425 long nr_writeback, bdi_nr_writeback;
426 long background_thresh; 426 unsigned long background_thresh;
427 long dirty_thresh; 427 unsigned long dirty_thresh;
428 long bdi_thresh; 428 unsigned long bdi_thresh;
429 unsigned long pages_written = 0; 429 unsigned long pages_written = 0;
430 unsigned long write_chunk = sync_writeback_pages(); 430 unsigned long write_chunk = sync_writeback_pages();
431 431
@@ -580,8 +580,8 @@ EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr);
580 580
581void throttle_vm_writeout(gfp_t gfp_mask) 581void throttle_vm_writeout(gfp_t gfp_mask)
582{ 582{
583 long background_thresh; 583 unsigned long background_thresh;
584 long dirty_thresh; 584 unsigned long dirty_thresh;
585 585
586 for ( ; ; ) { 586 for ( ; ; ) {
587 get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL); 587 get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL);
@@ -624,8 +624,8 @@ static void background_writeout(unsigned long _min_pages)
624 }; 624 };
625 625
626 for ( ; ; ) { 626 for ( ; ; ) {
627 long background_thresh; 627 unsigned long background_thresh;
628 long dirty_thresh; 628 unsigned long dirty_thresh;
629 629
630 get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL); 630 get_dirty_limits(&background_thresh, &dirty_thresh, NULL, NULL);
631 if (global_page_state(NR_FILE_DIRTY) + 631 if (global_page_state(NR_FILE_DIRTY) +