mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Btrfs: fix error handling in btrfs_truncate_inode_items()
btrfs_truncate_inode_items() uses two variables for error handling, ret and err. These are not handled consistently, leading to a couple of bugs. - Errors from btrfs_del_items() are handled but not propagated to the caller - If btrfs_run_delayed_refs() fails and aborts the transaction, we continue running Just use ret everywhere and simplify things a bit, fixing both of these issues. Fixes:79787eaab4
("btrfs: replace many BUG_ONs with proper error handling") Fixes:1262133b8d
("Btrfs: account for crcs in delayed ref processing") Reviewed-by: Nikolay Borisov <nborisov@suse.com> Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
d1342aadbd
commit
fd86a3a315
1 changed files with 31 additions and 30 deletions
|
@ -4705,7 +4705,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
int pending_del_slot = 0;
|
||||
int extent_type = -1;
|
||||
int ret;
|
||||
int err = 0;
|
||||
u64 ino = btrfs_ino(BTRFS_I(inode));
|
||||
u64 bytes_deleted = 0;
|
||||
bool be_nice = false;
|
||||
|
@ -4757,22 +4756,19 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
* up a huge file in a single leaf. Most of the time that
|
||||
* bytes_deleted is > 0, it will be huge by the time we get here
|
||||
*/
|
||||
if (be_nice && bytes_deleted > SZ_32M) {
|
||||
if (btrfs_should_end_transaction(trans)) {
|
||||
err = -EAGAIN;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
path->leave_spinning = 1;
|
||||
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
||||
if (ret < 0) {
|
||||
err = ret;
|
||||
if (be_nice && bytes_deleted > SZ_32M &&
|
||||
btrfs_should_end_transaction(trans)) {
|
||||
ret = -EAGAIN;
|
||||
goto out;
|
||||
}
|
||||
|
||||
path->leave_spinning = 1;
|
||||
ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
if (ret > 0) {
|
||||
ret = 0;
|
||||
/* there are no items in the tree for us to truncate, we're
|
||||
* done
|
||||
*/
|
||||
|
@ -4883,7 +4879,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
* We have to bail so the last_size is set to
|
||||
* just before this extent.
|
||||
*/
|
||||
err = NEED_TRUNCATE_BLOCK;
|
||||
ret = NEED_TRUNCATE_BLOCK;
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -4950,7 +4946,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
pending_del_nr);
|
||||
if (ret) {
|
||||
btrfs_abort_transaction(trans, ret);
|
||||
goto error;
|
||||
break;
|
||||
}
|
||||
pending_del_nr = 0;
|
||||
}
|
||||
|
@ -4961,8 +4957,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
trans->delayed_ref_updates = 0;
|
||||
ret = btrfs_run_delayed_refs(trans,
|
||||
updates * 2);
|
||||
if (ret && !err)
|
||||
err = ret;
|
||||
if (ret)
|
||||
break;
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
@ -4970,8 +4966,8 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
* and let the transaction restart
|
||||
*/
|
||||
if (should_end) {
|
||||
err = -EAGAIN;
|
||||
goto error;
|
||||
ret = -EAGAIN;
|
||||
break;
|
||||
}
|
||||
goto search_again;
|
||||
} else {
|
||||
|
@ -4979,32 +4975,37 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
|
|||
}
|
||||
}
|
||||
out:
|
||||
if (pending_del_nr) {
|
||||
ret = btrfs_del_items(trans, root, path, pending_del_slot,
|
||||
if (ret >= 0 && pending_del_nr) {
|
||||
int err;
|
||||
|
||||
err = btrfs_del_items(trans, root, path, pending_del_slot,
|
||||
pending_del_nr);
|
||||
if (ret)
|
||||
btrfs_abort_transaction(trans, ret);
|
||||
if (err) {
|
||||
btrfs_abort_transaction(trans, err);
|
||||
ret = err;
|
||||
}
|
||||
}
|
||||
error:
|
||||
if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {
|
||||
ASSERT(last_size >= new_size);
|
||||
if (!err && last_size > new_size)
|
||||
if (!ret && last_size > new_size)
|
||||
last_size = new_size;
|
||||
btrfs_ordered_update_i_size(inode, last_size, NULL);
|
||||
}
|
||||
|
||||
btrfs_free_path(path);
|
||||
|
||||
if (be_nice && bytes_deleted > SZ_32M) {
|
||||
if (be_nice && bytes_deleted > SZ_32M && (ret >= 0 || ret == -EAGAIN)) {
|
||||
unsigned long updates = trans->delayed_ref_updates;
|
||||
int err;
|
||||
|
||||
if (updates) {
|
||||
trans->delayed_ref_updates = 0;
|
||||
ret = btrfs_run_delayed_refs(trans, updates * 2);
|
||||
if (ret && !err)
|
||||
err = ret;
|
||||
err = btrfs_run_delayed_refs(trans, updates * 2);
|
||||
if (err)
|
||||
ret = err;
|
||||
}
|
||||
}
|
||||
return err;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue