Commit 0e8c36a9 authored by Miao Xie's avatar Miao Xie Committed by Josef Bacik

Btrfs: fix lots of orphan inodes when the space is not enough

We're running into having 50-100 orphans left over with xfstests 83
because of ENOSPC when trying to start the transaction for the inode update.
But in fact, it makes no sense in updating the inode for the new size while
we're deleting the stupid thing. This patch fixes this problem.
Reported-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 4ea41ce0
...@@ -1065,7 +1065,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node) ...@@ -1065,7 +1065,7 @@ static void btrfs_release_delayed_inode(struct btrfs_delayed_node *delayed_node)
} }
} }
static int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, static int __btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct btrfs_root *root,
struct btrfs_path *path, struct btrfs_path *path,
struct btrfs_delayed_node *node) struct btrfs_delayed_node *node)
...@@ -1075,22 +1075,15 @@ static int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, ...@@ -1075,22 +1075,15 @@ static int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,
struct extent_buffer *leaf; struct extent_buffer *leaf;
int ret; int ret;
mutex_lock(&node->mutex);
if (!node->inode_dirty) {
mutex_unlock(&node->mutex);
return 0;
}
key.objectid = node->inode_id; key.objectid = node->inode_id;
btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY); btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
key.offset = 0; key.offset = 0;
ret = btrfs_lookup_inode(trans, root, path, &key, 1); ret = btrfs_lookup_inode(trans, root, path, &key, 1);
if (ret > 0) { if (ret > 0) {
btrfs_release_path(path); btrfs_release_path(path);
mutex_unlock(&node->mutex);
return -ENOENT; return -ENOENT;
} else if (ret < 0) { } else if (ret < 0) {
mutex_unlock(&node->mutex);
return ret; return ret;
} }
...@@ -1105,11 +1098,28 @@ static int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans, ...@@ -1105,11 +1098,28 @@ static int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,
btrfs_delayed_inode_release_metadata(root, node); btrfs_delayed_inode_release_metadata(root, node);
btrfs_release_delayed_inode(node); btrfs_release_delayed_inode(node);
mutex_unlock(&node->mutex);
return 0; return 0;
} }
static inline int btrfs_update_delayed_inode(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_path *path,
struct btrfs_delayed_node *node)
{
int ret;
mutex_lock(&node->mutex);
if (!node->inode_dirty) {
mutex_unlock(&node->mutex);
return 0;
}
ret = __btrfs_update_delayed_inode(trans, root, path, node);
mutex_unlock(&node->mutex);
return ret;
}
static inline int static inline int
__btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
struct btrfs_path *path, struct btrfs_path *path,
...@@ -1230,6 +1240,60 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, ...@@ -1230,6 +1240,60 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
return ret; return ret;
} }
int btrfs_commit_inode_delayed_inode(struct inode *inode)
{
struct btrfs_trans_handle *trans;
struct btrfs_delayed_node *delayed_node = btrfs_get_delayed_node(inode);
struct btrfs_path *path;
struct btrfs_block_rsv *block_rsv;
int ret;
if (!delayed_node)
return 0;
mutex_lock(&delayed_node->mutex);
if (!delayed_node->inode_dirty) {
mutex_unlock(&delayed_node->mutex);
btrfs_release_delayed_node(delayed_node);
return 0;
}
mutex_unlock(&delayed_node->mutex);
trans = btrfs_join_transaction(delayed_node->root);
if (IS_ERR(trans)) {
ret = PTR_ERR(trans);
goto out;
}
path = btrfs_alloc_path();
if (!path) {
ret = -ENOMEM;
goto trans_out;
}
path->leave_spinning = 1;
block_rsv = trans->block_rsv;
trans->block_rsv = &delayed_node->root->fs_info->delayed_block_rsv;
mutex_lock(&delayed_node->mutex);
if (delayed_node->inode_dirty)
ret = __btrfs_update_delayed_inode(trans, delayed_node->root,
path, delayed_node);
else
ret = 0;
mutex_unlock(&delayed_node->mutex);
btrfs_free_path(path);
trans->block_rsv = block_rsv;
trans_out:
btrfs_end_transaction(trans, delayed_node->root);
btrfs_btree_balance_dirty(delayed_node->root);
out:
btrfs_release_delayed_node(delayed_node);
return ret;
}
void btrfs_remove_delayed_node(struct inode *inode) void btrfs_remove_delayed_node(struct inode *inode)
{ {
struct btrfs_delayed_node *delayed_node; struct btrfs_delayed_node *delayed_node;
......
...@@ -117,6 +117,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans, ...@@ -117,6 +117,7 @@ int btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
/* Used for evicting the inode. */ /* Used for evicting the inode. */
void btrfs_remove_delayed_node(struct inode *inode); void btrfs_remove_delayed_node(struct inode *inode);
void btrfs_kill_delayed_inode_items(struct inode *inode); void btrfs_kill_delayed_inode_items(struct inode *inode);
int btrfs_commit_inode_delayed_inode(struct inode *inode);
int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans, int btrfs_delayed_update_inode(struct btrfs_trans_handle *trans,
......
...@@ -3904,6 +3904,12 @@ void btrfs_evict_inode(struct inode *inode) ...@@ -3904,6 +3904,12 @@ void btrfs_evict_inode(struct inode *inode)
goto no_delete; goto no_delete;
} }
ret = btrfs_commit_inode_delayed_inode(inode);
if (ret) {
btrfs_orphan_del(NULL, inode);
goto no_delete;
}
rsv = btrfs_alloc_block_rsv(root, BTRFS_BLOCK_RSV_TEMP); rsv = btrfs_alloc_block_rsv(root, BTRFS_BLOCK_RSV_TEMP);
if (!rsv) { if (!rsv) {
btrfs_orphan_del(NULL, inode); btrfs_orphan_del(NULL, inode);
...@@ -3941,7 +3947,7 @@ void btrfs_evict_inode(struct inode *inode) ...@@ -3941,7 +3947,7 @@ void btrfs_evict_inode(struct inode *inode)
goto no_delete; goto no_delete;
} }
trans = btrfs_start_transaction_lflush(root, 1); trans = btrfs_join_transaction(root);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
btrfs_orphan_del(NULL, inode); btrfs_orphan_del(NULL, inode);
btrfs_free_block_rsv(root, rsv); btrfs_free_block_rsv(root, rsv);
...@@ -3955,9 +3961,6 @@ void btrfs_evict_inode(struct inode *inode) ...@@ -3955,9 +3961,6 @@ void btrfs_evict_inode(struct inode *inode)
break; break;
trans->block_rsv = &root->fs_info->trans_block_rsv; trans->block_rsv = &root->fs_info->trans_block_rsv;
ret = btrfs_update_inode(trans, root, inode);
BUG_ON(ret);
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
trans = NULL; trans = NULL;
btrfs_btree_balance_dirty(root); btrfs_btree_balance_dirty(root);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment