btrfs: all btrfs_delalloc_release_metadata take btrfs_inode (691fa059) · Commits · 戴 / test

fs/btrfs/ctree.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -2704,7 +2704,7 @@ int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
		void btrfs_subvolume_release_metadata(struct btrfs_fs_info *fs_info,
		struct btrfs_block_rsv *rsv);
		int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);
		void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes);
		void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes);
		int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len);
		void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len);
		void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type);

fs/btrfs/extent-tree.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -6081,27 +6081,27 @@ out_fail:
		* once we complete IO for a given set of bytes to release their metadata
		* reservations.
		*/
		void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes)
		void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes)
		{
		struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
		struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
		u64 to_free = 0;
		unsigned dropped;

		num_bytes = ALIGN(num_bytes, fs_info->sectorsize);
		spin_lock(&BTRFS_I(inode)->lock);
		dropped = drop_outstanding_extent(BTRFS_I(inode), num_bytes);
		spin_lock(&inode->lock);
		dropped = drop_outstanding_extent(inode, num_bytes);

		if (num_bytes)
		to_free = calc_csum_metadata_size(BTRFS_I(inode), num_bytes, 0);
		spin_unlock(&BTRFS_I(inode)->lock);
		to_free = calc_csum_metadata_size(inode, num_bytes, 0);
		spin_unlock(&inode->lock);
		if (dropped > 0)
		to_free += btrfs_calc_trans_metadata_size(fs_info, dropped);

		if (btrfs_is_testing(fs_info))
		return;

		trace_btrfs_space_reservation(fs_info, "delalloc",
		btrfs_ino(BTRFS_I(inode)), to_free, 0);
		trace_btrfs_space_reservation(fs_info, "delalloc", btrfs_ino(inode),
		to_free, 0);

		btrfs_block_rsv_release(fs_info, &fs_info->delalloc_block_rsv, to_free);
		}
		@@ -6159,7 +6159,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode, u64 start, u64 len)
		*/
		void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len)
		{
		btrfs_delalloc_release_metadata(inode, len);
		btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
		btrfs_free_reserved_data_space(inode, start, len);
		}

fs/btrfs/file.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1678,7 +1678,7 @@ again:
		spin_unlock(&BTRFS_I(inode)->lock);
		}
		if (only_release_metadata) {
		btrfs_delalloc_release_metadata(inode,
		btrfs_delalloc_release_metadata(BTRFS_I(inode),
		release_bytes);
		} else {
		u64 __pos;
		@@ -1739,7 +1739,8 @@ again:
		if (release_bytes) {
		if (only_release_metadata) {
		btrfs_end_write_no_snapshoting(root);
		btrfs_delalloc_release_metadata(inode, release_bytes);
		btrfs_delalloc_release_metadata(BTRFS_I(inode),
		release_bytes);
		} else {
		btrfs_delalloc_release_space(inode,
		round_down(pos, fs_info->sectorsize),

fs/btrfs/free-space-cache.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3545,7 +3545,8 @@ int btrfs_write_out_ino_cache(struct btrfs_root *root,

		if (ret) {
		if (release_metadata)
		btrfs_delalloc_release_metadata(inode, inode->i_size);
		btrfs_delalloc_release_metadata(BTRFS_I(inode),
		inode->i_size);
		#ifdef DEBUG
		btrfs_err(fs_info,
		"failed to write free ino cache for root %llu",

fs/btrfs/inode-map.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -499,7 +499,7 @@ again:
		ret = btrfs_prealloc_file_range_trans(inode, trans, 0, 0, prealloc,
		prealloc, prealloc, &alloc_hint);
		if (ret) {
		btrfs_delalloc_release_metadata(inode, prealloc);
		btrfs_delalloc_release_metadata(BTRFS_I(inode), prealloc);
		goto out_put;
		}

Admin message