diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:11:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-26 13:11:13 -0400 |
commit | bfebb1406329667f2cccb50fad1de87f573b2c1a (patch) | |
tree | 88ae0944ca0a36b169d23c90e9819422935ee793 /fs | |
parent | 07e2e6ba2761291aa182993ebba1f490b5005dcc (diff) | |
parent | a72bfd4dea053bb8e2233902c3f1893ef5485802 (diff) |
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()
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fs-writeback.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index fb61178c86e3..9d5360c4c2af 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
@@ -250,9 +250,11 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi, | |||
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) | |||
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 | ||