History

Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

* 'writeback' of git://git.kernel.dk/linux-2.6-block: writeback: pass in super_block to bdi_start_writeback()

Linus Torvalds committed 17 years ago

Commit bfebb142 parents 07e2e6b a72bfd43 files · +7 −4Browse files

Unified · Split

3 files
  1. fs/fs-writeback.c +4 −2
  2. include/linux/backing-dev.h +2 −1
  3. mm/page-writeback.c +1 −1
fs/fs-writeback.c+4−2
@@ -250,9 +250,11 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi, · 249 unmodified lines
250250 * completion. Caller need not hold sb s_umount semaphore.
251251 *
252252 */
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)
254255 {
255256 struct wb_writeback_args args = {
257+ .sb = sb,
256258 .sync_mode = WB_SYNC_NONE,
257259 .nr_pages = nr_pages,
258260 .range_cyclic = 1,
@@ -1206,7 +1208,7 @@ void writeback_inodes_sb(struct super_block *sb) · 947 unmodified lines
12061208 nr_to_write = nr_dirty + nr_unstable +
12071209 (inodes_stat.nr_inodes - inodes_stat.nr_unused);
12081210
1209− bdi_start_writeback(sb->s_bdi, nr_to_write);
1211+ bdi_start_writeback(sb->s_bdi, sb, nr_to_write);
12101212 }
12111213 EXPORT_SYMBOL(writeback_inodes_sb);
12121214
include/linux/backing-dev.h+2−1
@@ -101,7 +101,8 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, · 100 unmodified lines
101101 const char *fmt, ...);
102102 int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);
103103 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);
105106 int bdi_writeback_task(struct bdi_writeback *wb);
106107 int bdi_has_dirty_io(struct backing_dev_info *bdi);
107108
mm/page-writeback.c+1−1
@@ -596,7 +596,7 @@ static void balance_dirty_pages(struct address_space *mapping, · 595 unmodified lines
596596 (!laptop_mode && ((global_page_state(NR_FILE_DIRTY)
597597 + global_page_state(NR_UNSTABLE_NFS))
598598 > background_thresh)))
599− bdi_start_writeback(bdi, 0);
599+ bdi_start_writeback(bdi, NULL, 0);
600600 }
601601
602602 void set_page_dirty_balance(struct page *page, int page_mkwrite)

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