Commit b4912139 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: change nr to u64 in btrfs_start_delalloc_roots 



We have btrfs_wait_ordered_roots() which takes a u64 for nr, but
btrfs_start_delalloc_roots() that takes an int for nr, which makes using
them in conjunction, especially for something like (u64)-1, annoying and
inconsistent.  Fix btrfs_start_delalloc_roots() to take a u64 for nr and
adjust start_delalloc_inodes() and it's callers appropriately.

This means we've adjusted start_delalloc_inodes() to take a pointer of
nr since we want to preserve the ability for start-delalloc_inodes() to
return an error, so simply make it do the nr adjusting as necessary.

Part of adjusting the callers to this means changing
btrfs_writeback_inodes_sb_nr() to take a u64 for items.  This may be
confusing because it seems unrelated, but the caller of
btrfs_writeback_inodes_sb_nr() already passes in a u64, it's just the
function variable that needs to be changed.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Tested-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8e560081

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2956,7 +2956,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, int nr);

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr);

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

			      unsigned int extra_bits,

			      struct extent_state **cached_state);

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,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, -1);

	ret = btrfs_start_delalloc_roots(fs_info, U64_MAX);

	if (ret) {

		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

fs/btrfs/inode.c

+10 −16
Original line number Diff line number Diff line
@@ -9387,7 +9387,7 @@ static struct btrfs_delalloc_work *btrfs_alloc_delalloc_work(struct inode *inode 
 * some fairly slow code that needs optimization. This walks the list

 * of all the inodes with pending delalloc and forces them to disk.

 */

static int start_delalloc_inodes(struct btrfs_root *root, int nr, bool snapshot)

static int start_delalloc_inodes(struct btrfs_root *root, u64 *nr, bool snapshot)

{

	struct btrfs_inode *binode;

	struct inode *inode;
@@ -9427,9 +9427,11 @@ static int start_delalloc_inodes(struct btrfs_root *root, int nr, bool snapshot) 
		list_add_tail(&work->list, &works);

		btrfs_queue_work(root->fs_info->flush_workers,

				 &work->work);

		ret++;

		if (nr != -1 && ret >= nr)

		if (*nr != U64_MAX) {

			(*nr)--;

			if (*nr == 0)

				goto out;

		}

		cond_resched();

		spin_lock(&root->delalloc_lock);

	}
@@ -9454,18 +9456,15 @@ out: 
int btrfs_start_delalloc_snapshot(struct btrfs_root *root)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	int ret;

	u64 nr = U64_MAX;



	if (test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))

		return -EROFS;



	ret = start_delalloc_inodes(root, -1, true);

	if (ret > 0)

		ret = 0;

	return ret;

	return start_delalloc_inodes(root, &nr, true);

}



int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr)

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, u64 nr)

{

	struct btrfs_root *root;

	struct list_head splice;
@@ -9488,15 +9487,10 @@ int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int nr) 
			       &fs_info->delalloc_roots);

		spin_unlock(&fs_info->delalloc_root_lock);



		ret = start_delalloc_inodes(root, nr, false);

		ret = start_delalloc_inodes(root, &nr, false);

		btrfs_put_root(root);

		if (ret < 0)

			goto out;



		if (nr != -1) {

			nr -= ret;

			WARN_ON(nr < 0);

		}

		spin_lock(&fs_info->delalloc_root_lock);

	}

	spin_unlock(&fs_info->delalloc_root_lock);

fs/btrfs/ioctl.c

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

		int ret;



		ret = btrfs_start_delalloc_roots(fs_info, -1);

		ret = btrfs_start_delalloc_roots(fs_info, U64_MAX);

		if (ret)

			return ret;

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

fs/btrfs/space-info.c

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ again: 
}



static void btrfs_writeback_inodes_sb_nr(struct btrfs_fs_info *fs_info,

					 unsigned long nr_pages, int nr_items)

					 unsigned long nr_pages, u64 nr_items)

{

	struct super_block *sb = fs_info->sb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE