mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-17 17:53:56 +08:00
btrfs: Make btrfs_orphan_release_metadata take btrfs_inode
Signed-off-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
8ed7a2a0e0
commit
703b391a03
@ -2696,7 +2696,7 @@ void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
|
|||||||
void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);
|
void btrfs_trans_release_chunk_metadata(struct btrfs_trans_handle *trans);
|
||||||
int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
|
int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_inode *inode);
|
struct btrfs_inode *inode);
|
||||||
void btrfs_orphan_release_metadata(struct inode *inode);
|
void btrfs_orphan_release_metadata(struct btrfs_inode *inode);
|
||||||
int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
|
int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
|
||||||
struct btrfs_block_rsv *rsv,
|
struct btrfs_block_rsv *rsv,
|
||||||
int nitems,
|
int nitems,
|
||||||
|
@ -5767,14 +5767,14 @@ int btrfs_orphan_reserve_metadata(struct btrfs_trans_handle *trans,
|
|||||||
return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
|
return btrfs_block_rsv_migrate(src_rsv, dst_rsv, num_bytes, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void btrfs_orphan_release_metadata(struct inode *inode)
|
void btrfs_orphan_release_metadata(struct btrfs_inode *inode)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
|
struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
|
||||||
struct btrfs_root *root = BTRFS_I(inode)->root;
|
struct btrfs_root *root = inode->root;
|
||||||
u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
|
u64 num_bytes = btrfs_calc_trans_metadata_size(fs_info, 1);
|
||||||
|
|
||||||
trace_btrfs_space_reservation(fs_info, "orphan",
|
trace_btrfs_space_reservation(fs_info, "orphan", btrfs_ino(inode),
|
||||||
btrfs_ino(BTRFS_I(inode)), num_bytes, 0);
|
num_bytes, 0);
|
||||||
btrfs_block_rsv_release(fs_info, root->orphan_block_rsv, num_bytes);
|
btrfs_block_rsv_release(fs_info, root->orphan_block_rsv, num_bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3237,7 +3237,7 @@ int btrfs_orphan_add(struct btrfs_trans_handle *trans, struct inode *inode)
|
|||||||
if (reserve) {
|
if (reserve) {
|
||||||
clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
|
clear_bit(BTRFS_INODE_ORPHAN_META_RESERVED,
|
||||||
&BTRFS_I(inode)->runtime_flags);
|
&BTRFS_I(inode)->runtime_flags);
|
||||||
btrfs_orphan_release_metadata(inode);
|
btrfs_orphan_release_metadata(BTRFS_I(inode));
|
||||||
}
|
}
|
||||||
if (ret != -EEXIST) {
|
if (ret != -EEXIST) {
|
||||||
clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
|
clear_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,
|
||||||
@ -3291,7 +3291,7 @@ static int btrfs_orphan_del(struct btrfs_trans_handle *trans,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (release_rsv)
|
if (release_rsv)
|
||||||
btrfs_orphan_release_metadata(inode);
|
btrfs_orphan_release_metadata(BTRFS_I(inode));
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user