aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-06-10 06:07:27 -0400
committerJens Axboe <jaxboe@fusionio.com>2010-07-06 02:54:03 -0400
commit9c3a8ee8a1d72c5c0d7fbdf426d80e270ddfa54c (patch)
treefa131760a61f66afeede852622ede0d716965489 /fs
parent06d738fa9155ff16dba3d7e501ba4581d01a98cb (diff)
writeback: remove writeback_inodes_wbc
This was just an odd wrapper around writeback_inodes_wb. Removing this also allows to get rid of the bdi member of struct writeback_control which was rather out of place there. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/afs/write.c1
-rw-r--r--fs/btrfs/extent_io.c2
-rw-r--r--fs/fs-writeback.c12
3 files changed, 2 insertions, 13 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 3dab9e9948d0..722743b152d8 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -680,7 +680,6 @@ int afs_writeback_all(struct afs_vnode *vnode)
680{ 680{
681 struct address_space *mapping = vnode->vfs_inode.i_mapping; 681 struct address_space *mapping = vnode->vfs_inode.i_mapping;
682 struct writeback_control wbc = { 682 struct writeback_control wbc = {
683 .bdi = mapping->backing_dev_info,
684 .sync_mode = WB_SYNC_ALL, 683 .sync_mode = WB_SYNC_ALL,
685 .nr_to_write = LONG_MAX, 684 .nr_to_write = LONG_MAX,
686 .range_cyclic = 1, 685 .range_cyclic = 1,
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a4080c21ec55..d74e6af9b53a 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2594,7 +2594,6 @@ int extent_write_full_page(struct extent_io_tree *tree, struct page *page,
2594 .sync_io = wbc->sync_mode == WB_SYNC_ALL, 2594 .sync_io = wbc->sync_mode == WB_SYNC_ALL,
2595 }; 2595 };
2596 struct writeback_control wbc_writepages = { 2596 struct writeback_control wbc_writepages = {
2597 .bdi = wbc->bdi,
2598 .sync_mode = wbc->sync_mode, 2597 .sync_mode = wbc->sync_mode,
2599 .older_than_this = NULL, 2598 .older_than_this = NULL,
2600 .nr_to_write = 64, 2599 .nr_to_write = 64,
@@ -2628,7 +2627,6 @@ int extent_write_locked_range(struct extent_io_tree *tree, struct inode *inode,
2628 .sync_io = mode == WB_SYNC_ALL, 2627 .sync_io = mode == WB_SYNC_ALL,
2629 }; 2628 };
2630 struct writeback_control wbc_writepages = { 2629 struct writeback_control wbc_writepages = {
2631 .bdi = inode->i_mapping->backing_dev_info,
2632 .sync_mode = mode, 2630 .sync_mode = mode,
2633 .older_than_this = NULL, 2631 .older_than_this = NULL,
2634 .nr_to_write = nr_pages * 2, 2632 .nr_to_write = nr_pages * 2,
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 6981e4b7c148..94a602e98bb5 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -614,8 +614,8 @@ static int writeback_sb_inodes(struct super_block *sb,
614 return 1; 614 return 1;
615} 615}
616 616
617static void writeback_inodes_wb(struct bdi_writeback *wb, 617void writeback_inodes_wb(struct bdi_writeback *wb,
618 struct writeback_control *wbc) 618 struct writeback_control *wbc)
619{ 619{
620 int ret = 0; 620 int ret = 0;
621 621
@@ -660,13 +660,6 @@ static void writeback_inodes_wb(struct bdi_writeback *wb,
660 /* Leave any unwritten inodes on b_io */ 660 /* Leave any unwritten inodes on b_io */
661} 661}
662 662
663void writeback_inodes_wbc(struct writeback_control *wbc)
664{
665 struct backing_dev_info *bdi = wbc->bdi;
666
667 writeback_inodes_wb(&bdi->wb, wbc);
668}
669
670/* 663/*
671 * The maximum number of pages to writeout in a single bdi flush/kupdate 664 * The maximum number of pages to writeout in a single bdi flush/kupdate
672 * operation. We do this so we don't hold I_SYNC against an inode for 665 * operation. We do this so we don't hold I_SYNC against an inode for
@@ -705,7 +698,6 @@ static long wb_writeback(struct bdi_writeback *wb,
705 struct wb_writeback_args *args) 698 struct wb_writeback_args *args)
706{ 699{
707 struct writeback_control wbc = { 700 struct writeback_control wbc = {
708 .bdi = wb->bdi,
709 .sb = args->sb, 701 .sb = args->sb,
710 .sync_mode = args->sync_mode, 702 .sync_mode = args->sync_mode,
711 .older_than_this = NULL, 703 .older_than_this = NULL,