Commit 9db4dc24 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: make btrfs_start_delalloc_root's nr argument a long 



It's currently u64 which gets instantly translated either to LONG_MAX
(if U64_MAX is passed) or cast to an unsigned long (which is in fact,
wrong because writeback_control::nr_to_write is a signed, long type).

Just convert the function's argument to be long time which obviates the
need to manually convert u64 value to a long. Adjust all call sites
which pass U64_MAX to pass LONG_MAX. Finally ensure that in
shrink_delalloc the u64 is converted to a long without overflowing,
resulting in a negative number.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 9c4a062a

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3100,7 +3100,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
			       u32 min_type);



int btrfs_start_delalloc_snapshot(struct btrfs_root *root);

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr,

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,

			       bool in_reclaim_context);

int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,

			      unsigned int extra_bits,

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	 * flush all outstanding I/O and inode extent mappings before the

	 * copy operation is declared as being finished

	 */

	ret = btrfs_start_delalloc_roots(fs_info, U64_MAX, false);

	ret = btrfs_start_delalloc_roots(fs_info, LONG_MAX, false);

	if (ret) {

		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

fs/btrfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -9489,11 +9489,11 @@ int btrfs_start_delalloc_snapshot(struct btrfs_root *root) 
	return start_delalloc_inodes(root, &wbc, true, false);

}



int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr,

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, long nr,

			       bool in_reclaim_context)

{

	struct writeback_control wbc = {

		.nr_to_write = (nr == U64_MAX) ? LONG_MAX : (unsigned long)nr,

		.nr_to_write = nr,

		.sync_mode = WB_SYNC_NONE,

		.range_start = 0,

		.range_end = LLONG_MAX,
@@ -9515,7 +9515,7 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr, 
		 * Reset nr_to_write here so we know that we're doing a full

		 * flush.

		 */

		if (nr == U64_MAX)

		if (nr == LONG_MAX)

			wbc.nr_to_write = LONG_MAX;



		root = list_first_entry(&splice, struct btrfs_root,

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -4946,7 +4946,7 @@ long btrfs_ioctl(struct file *file, unsigned int 
	case BTRFS_IOC_SYNC: {

		int ret;



		ret = btrfs_start_delalloc_roots(fs_info, U64_MAX, false);

		ret = btrfs_start_delalloc_roots(fs_info, LONG_MAX, false);

		if (ret)

			return ret;

		ret = btrfs_sync_fs(inode->i_sb, 1);

fs/btrfs/space-info.c

+2 −1
Original line number Diff line number Diff line
@@ -532,7 +532,8 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info, 


	loops = 0;

	while ((delalloc_bytes || dio_bytes) && loops < 3) {

		u64 nr_pages = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;

		u64 temp = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;

		long nr_pages = min_t(u64, temp, LONG_MAX);



		btrfs_start_delalloc_roots(fs_info, nr_pages, true);