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

Commit d0e1d66b authored by Namjae Jeon's avatar Namjae Jeon Committed by Linus Torvalds
Browse files

writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr() 



There is no reason to pass the nr_pages_dirtied argument, because
nr_pages_dirtied value from the caller is unused in
balance_dirty_pages_ratelimited_nr().

Signed-off-by: default avatarNamjae Jeon <linkinjeon@gmail.com>
Signed-off-by: default avatarVivek Trivedi <vtrivedi018@gmail.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b58ed041

fs/btrfs/disk-io.c

+4 −4
Original line number Diff line number Diff line
@@ -3416,8 +3416,8 @@ void btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr) 
	num_dirty = root->fs_info->dirty_metadata_bytes;



	if (num_dirty > thresh) {

		balance_dirty_pages_ratelimited_nr(

				   root->fs_info->btree_inode->i_mapping, 1);

		balance_dirty_pages_ratelimited(

				   root->fs_info->btree_inode->i_mapping);

	}

	return;

}
@@ -3437,8 +3437,8 @@ void __btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr) 
	num_dirty = root->fs_info->dirty_metadata_bytes;



	if (num_dirty > thresh) {

		balance_dirty_pages_ratelimited_nr(

				   root->fs_info->btree_inode->i_mapping, 1);

		balance_dirty_pages_ratelimited(

				   root->fs_info->btree_inode->i_mapping);

	}

	return;

}

fs/btrfs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -1346,8 +1346,7 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file, 


		cond_resched();



		balance_dirty_pages_ratelimited_nr(inode->i_mapping,

						   dirty_pages);

		balance_dirty_pages_ratelimited(inode->i_mapping);

		if (dirty_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)

			btrfs_btree_balance_dirty(root, 1);

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, 
		}



		defrag_count += ret;

		balance_dirty_pages_ratelimited_nr(inode->i_mapping, ret);

		balance_dirty_pages_ratelimited(inode->i_mapping);

		mutex_unlock(&inode->i_mutex);



		if (newer_than) {

fs/ocfs2/file.c

+1 −4
Original line number Diff line number Diff line
@@ -2513,18 +2513,15 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe, 
		ret = sd.num_spliced;



	if (ret > 0) {

		unsigned long nr_pages;

		int err;



		nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;



		err = generic_write_sync(out, *ppos, ret);

		if (err)

			ret = err;

		else

			*ppos += ret;



		balance_dirty_pages_ratelimited_nr(mapping, nr_pages);

		balance_dirty_pages_ratelimited(mapping);

	}



	return ret;

fs/splice.c

+1 −4
Original line number Diff line number Diff line
@@ -1024,17 +1024,14 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, 
		ret = sd.num_spliced;



	if (ret > 0) {

		unsigned long nr_pages;

		int err;



		nr_pages = (ret + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;



		err = generic_write_sync(out, *ppos, ret);

		if (err)

			ret = err;

		else

			*ppos += ret;

		balance_dirty_pages_ratelimited_nr(mapping, nr_pages);

		balance_dirty_pages_ratelimited(mapping);

	}

	sb_end_write(inode->i_sb);