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

Commit 2b877331 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 02a3307a

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -3182,6 +3182,8 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, 
			      u64 *orig_start, u64 *orig_block_len,

			      u64 *ram_bytes);



void __btrfs_del_delalloc_inode(struct btrfs_root *root,

				struct btrfs_inode *inode);

struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry);

int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index);

int btrfs_unlink_inode(struct btrfs_trans_handle *trans,

fs/btrfs/inode.c

+10 −3
Original line number Diff line number Diff line
@@ -1742,12 +1742,12 @@ static void btrfs_add_delalloc_inodes(struct btrfs_root *root, 
	spin_unlock(&root->delalloc_lock);

}



static void btrfs_del_delalloc_inode(struct btrfs_root *root,



void __btrfs_del_delalloc_inode(struct btrfs_root *root,

				struct btrfs_inode *inode)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb);



	spin_lock(&root->delalloc_lock);

	if (!list_empty(&inode->delalloc_inodes)) {

		list_del_init(&inode->delalloc_inodes);

		clear_bit(BTRFS_INODE_IN_DELALLOC_LIST,
@@ -1760,6 +1760,13 @@ static void btrfs_del_delalloc_inode(struct btrfs_root *root, 
			spin_unlock(&fs_info->delalloc_root_lock);

		}

	}

}



static void btrfs_del_delalloc_inode(struct btrfs_root *root,

				     struct btrfs_inode *inode)

{

	spin_lock(&root->delalloc_lock);

	__btrfs_del_delalloc_inode(root, inode);

	spin_unlock(&root->delalloc_lock);

}