diff options
| -rw-r--r-- | fs/btrfs/ctree.h | 2 | ||||
| -rw-r--r-- | fs/btrfs/inode.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 2771cc56a622..0d422c9908b8 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -3182,6 +3182,8 @@ noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, | |||
| 3182 | u64 *orig_start, u64 *orig_block_len, | 3182 | u64 *orig_start, u64 *orig_block_len, |
| 3183 | u64 *ram_bytes); | 3183 | u64 *ram_bytes); |
| 3184 | 3184 | ||
| 3185 | void __btrfs_del_delalloc_inode(struct btrfs_root *root, | ||
| 3186 | struct btrfs_inode *inode); | ||
| 3185 | struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry); | 3187 | struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry); |
| 3186 | int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index); | 3188 | int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index); |
| 3187 | int btrfs_unlink_inode(struct btrfs_trans_handle *trans, | 3189 | int btrfs_unlink_inode(struct btrfs_trans_handle *trans, |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index d241285a0d2a..8e604e7071f1 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
| @@ -1742,12 +1742,12 @@ static void btrfs_add_delalloc_inodes(struct btrfs_root *root, | |||
| 1742 | spin_unlock(&root->delalloc_lock); | 1742 | spin_unlock(&root->delalloc_lock); |
| 1743 | } | 1743 | } |
| 1744 | 1744 | ||
| 1745 | static void btrfs_del_delalloc_inode(struct btrfs_root *root, | 1745 | |
| 1746 | struct btrfs_inode *inode) | 1746 | void __btrfs_del_delalloc_inode(struct btrfs_root *root, |
| 1747 | struct btrfs_inode *inode) | ||
| 1747 | { | 1748 | { |
| 1748 | struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb); | 1749 | struct btrfs_fs_info *fs_info = btrfs_sb(inode->vfs_inode.i_sb); |
| 1749 | 1750 | ||
| 1750 | spin_lock(&root->delalloc_lock); | ||
| 1751 | if (!list_empty(&inode->delalloc_inodes)) { | 1751 | if (!list_empty(&inode->delalloc_inodes)) { |
| 1752 | list_del_init(&inode->delalloc_inodes); | 1752 | list_del_init(&inode->delalloc_inodes); |
| 1753 | clear_bit(BTRFS_INODE_IN_DELALLOC_LIST, | 1753 | clear_bit(BTRFS_INODE_IN_DELALLOC_LIST, |
| @@ -1760,6 +1760,13 @@ static void btrfs_del_delalloc_inode(struct btrfs_root *root, | |||
| 1760 | spin_unlock(&fs_info->delalloc_root_lock); | 1760 | spin_unlock(&fs_info->delalloc_root_lock); |
| 1761 | } | 1761 | } |
| 1762 | } | 1762 | } |
| 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); | ||
| 1763 | spin_unlock(&root->delalloc_lock); | 1770 | spin_unlock(&root->delalloc_lock); |
| 1764 | } | 1771 | } |
| 1765 | 1772 | ||
