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

Commit 91aef86f authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: rename btrfs_start_all_delalloc_inodes 



rename the function -- btrfs_start_all_delalloc_inodes(), and make its
name be compatible to btrfs_wait_ordered_roots(), since they are always
used at the same place.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent b0244199

fs/btrfs/ctree.h

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



int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput);

int btrfs_start_all_delalloc_inodes(struct btrfs_fs_info *fs_info,

				    int delay_iput);

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput);

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

			      struct extent_state **cached_state);

int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,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_all_delalloc_inodes(root->fs_info, 0);

	ret = btrfs_start_delalloc_roots(root->fs_info, 0);

	if (ret) {

		mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);

		return ret;

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -4016,7 +4016,7 @@ static void btrfs_writeback_inodes_sb_nr(struct btrfs_root *root, 
		 * the filesystem is readonly(all dirty pages are written to

		 * the disk).

		 */

		btrfs_start_all_delalloc_inodes(root->fs_info, 0);

		btrfs_start_delalloc_roots(root->fs_info, 0);

		if (!current->journal_info)

			btrfs_wait_ordered_roots(root->fs_info, -1);

	}

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -8306,8 +8306,7 @@ int btrfs_start_delalloc_inodes(struct btrfs_root *root, int delay_iput) 
	return ret;

}



int btrfs_start_all_delalloc_inodes(struct btrfs_fs_info *fs_info,

				    int delay_iput)

int btrfs_start_delalloc_roots(struct btrfs_fs_info *fs_info, int delay_iput)

{

	struct btrfs_root *root;

	struct list_head splice;

fs/btrfs/ioctl.c

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

		int ret;



		ret = btrfs_start_all_delalloc_inodes(root->fs_info, 0);

		ret = btrfs_start_delalloc_roots(root->fs_info, 0);

		if (ret)

			return ret;

		ret = btrfs_sync_fs(file->f_dentry->d_sb, 1);