* 'writeback' of git://git.kernel.dk/linux-2.6-block: writeback: pass in super_block to bdi_start_writeback()
Unified · Split
| @@ -250,9 +250,11 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi, · 249 unmodified lines | |||
| 250 | * completion. Caller need not hold sb s_umount semaphore. | 250 | * completion. Caller need not hold sb s_umount semaphore. |
| 251 | * | 251 | * |
| 252 | */ | 252 | */ |
| 253 | void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages) | 253 | void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb, |
| 254 | long nr_pages) | ||
| 254 | { | 255 | { |
| 255 | struct wb_writeback_args args = { | 256 | struct wb_writeback_args args = { |
| 257 | .sb = sb, | ||
| 256 | .sync_mode = WB_SYNC_NONE, | 258 | .sync_mode = WB_SYNC_NONE, |
| 257 | .nr_pages = nr_pages, | 259 | .nr_pages = nr_pages, |
| 258 | .range_cyclic = 1, | 260 | .range_cyclic = 1, |
| @@ -1206,7 +1208,7 @@ void writeback_inodes_sb(struct super_block *sb) · 947 unmodified lines | |||
| 1206 | nr_to_write = nr_dirty + nr_unstable + | 1208 | nr_to_write = nr_dirty + nr_unstable + |
| 1207 | (inodes_stat.nr_inodes - inodes_stat.nr_unused); | 1209 | (inodes_stat.nr_inodes - inodes_stat.nr_unused); |
| 1208 | 1210 | ||
| 1209 | bdi_start_writeback(sb->s_bdi, nr_to_write); | 1211 | bdi_start_writeback(sb->s_bdi, sb, nr_to_write); |
| 1210 | } | 1212 | } |
| 1211 | EXPORT_SYMBOL(writeback_inodes_sb); | 1213 | EXPORT_SYMBOL(writeback_inodes_sb); |
| 1212 | 1214 | ||
| @@ -101,7 +101,8 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, · 100 unmodified lines | |||
| 101 | const char *fmt, ...); | 101 | const char *fmt, ...); |
| 102 | int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev); | 102 | int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev); |
| 103 | void bdi_unregister(struct backing_dev_info *bdi); | 103 | void bdi_unregister(struct backing_dev_info *bdi); |
| 104 | void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages); | 104 | void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb, |
| 105 | long nr_pages); | ||
| 105 | int bdi_writeback_task(struct bdi_writeback *wb); | 106 | int bdi_writeback_task(struct bdi_writeback *wb); |
| 106 | int bdi_has_dirty_io(struct backing_dev_info *bdi); | 107 | int bdi_has_dirty_io(struct backing_dev_info *bdi); |
| 107 | 108 | ||
| @@ -596,7 +596,7 @@ static void balance_dirty_pages(struct address_space *mapping, · 595 unmodified lines | |||
| 596 | (!laptop_mode && ((global_page_state(NR_FILE_DIRTY) | 596 | (!laptop_mode && ((global_page_state(NR_FILE_DIRTY) |
| 597 | + global_page_state(NR_UNSTABLE_NFS)) | 597 | + global_page_state(NR_UNSTABLE_NFS)) |
| 598 | > background_thresh))) | 598 | > background_thresh))) |
| 599 | bdi_start_writeback(bdi, 0); | 599 | bdi_start_writeback(bdi, NULL, 0); |
| 600 | } | 600 | } |
| 601 | 601 | ||
| 602 | void set_page_dirty_balance(struct page *page, int page_mkwrite) | 602 | void set_page_dirty_balance(struct page *page, int page_mkwrite) |