Skip to content

Commit 2b87733

Browse files
lorddoskiaskdave
authored andcommitted
btrfs: Split btrfs_del_delalloc_inode into 2 functions
This is in preparation of fixing delalloc inodes leakage on transaction abort. Also export the new function. Signed-off-by: Nikolay Borisov <[email protected]> Reviewed-by: David Sterba <[email protected]> Reviewed-by: Anand Jain <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 02a3307 commit 2b87733

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

fs/btrfs/ctree.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3182,6 +3182,8 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,
31823182
u64 *orig_start, u64 *orig_block_len,
31833183
u64 *ram_bytes);
31843184

3185+
void __btrfs_del_delalloc_inode(struct btrfs_root *root,
3186+
struct btrfs_inode *inode);
31853187
struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);
31863188
int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index);
31873189
int btrfs_unlink_inode(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,12 +1742,12 @@ static void btrfs_add_delalloc_inodes(struct btrfs_root *root,
17421742
spin_unlock(&root->delalloc_lock);
17431743
}
17441744

1745-
static void btrfs_del_delalloc_inode(struct btrfs_root *root,
1746-
struct btrfs_inode *inode)
1745+
1746+
void __btrfs_del_delalloc_inode(struct btrfs_root *root,
1747+
struct btrfs_inode *inode)
17471748
{
17481749
struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);
17491750

1750-
spin_lock(&root->delalloc_lock);
17511751
if (!list_empty(&inode->delalloc_inodes)) {
17521752
list_del_init(&inode->delalloc_inodes);
17531753
clear_bit(BTRFS_INODE_IN_DELALLOC_LIST,
@@ -1760,6 +1760,13 @@ static void btrfs_del_delalloc_inode(struct btrfs_root *root,
17601760
spin_unlock(&fs_info->delalloc_root_lock);
17611761
}
17621762
}
1763+
}
1764+
1765+
static void btrfs_del_delalloc_inode(struct btrfs_root *root,
1766+
struct btrfs_inode *inode)
1767+
{
1768+
spin_lock(&root->delalloc_lock);
1769+
__btrfs_del_delalloc_inode(root, inode);
17631770
spin_unlock(&root->delalloc_lock);
17641771
}
17651772

0 commit comments

Comments
 (0)