Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfebb140 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 07e2e6ba a72bfd4d

fs/fs-writeback.c

+4 −2
Original line number Diff line number Diff line
@@ -250,9 +250,11 @@ static void bdi_sync_writeback(struct backing_dev_info *bdi, 
 *   completion. Caller need not hold sb s_umount semaphore.

 *

 */

void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages)

void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,

			 long nr_pages)

{

	struct wb_writeback_args args = {

		.sb		= sb,

		.sync_mode	= WB_SYNC_NONE,

		.nr_pages	= nr_pages,

		.range_cyclic	= 1,
@@ -1206,7 +1208,7 @@ void writeback_inodes_sb(struct super_block *sb) 
	nr_to_write = nr_dirty + nr_unstable +

			(inodes_stat.nr_inodes - inodes_stat.nr_unused);



	bdi_start_writeback(sb->s_bdi, nr_to_write);

	bdi_start_writeback(sb->s_bdi, sb, nr_to_write);

}

EXPORT_SYMBOL(writeback_inodes_sb);

include/linux/backing-dev.h

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ int bdi_register(struct backing_dev_info *bdi, struct device *parent, 
		const char *fmt, ...);

int bdi_register_dev(struct backing_dev_info *bdi, dev_t dev);

void bdi_unregister(struct backing_dev_info *bdi);

void bdi_start_writeback(struct backing_dev_info *bdi, long nr_pages);

void bdi_start_writeback(struct backing_dev_info *bdi, struct super_block *sb,

				long nr_pages);

int bdi_writeback_task(struct bdi_writeback *wb);

int bdi_has_dirty_io(struct backing_dev_info *bdi);

mm/page-writeback.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ static void balance_dirty_pages(struct address_space *mapping, 
	    (!laptop_mode && ((global_page_state(NR_FILE_DIRTY)

			       + global_page_state(NR_UNSTABLE_NFS))

					  > background_thresh)))

		bdi_start_writeback(bdi, 0);

		bdi_start_writeback(bdi, NULL, 0);

}



void set_page_dirty_balance(struct page *page, int page_mkwrite)