Skip to content

Commit

Permalink
btrfs-progs: improve error handling in btrfs_split_item()
Browse files Browse the repository at this point in the history
This involves the following error cases:

- Unable to find the original item
  Return -EAGAIN and release the path (which is not done in the original
  code)

- Error from split_leaf()
  Remove the BUG_ON() and handle the error.
  The most common error is ENOSPC.

- Error from kmalloc()
  Just handle the error and return -ENOMEM.

Issue: #312
Signed-off-by: Qu Wenruo <[email protected]>
  • Loading branch information
adam900710 committed Nov 22, 2024
1 parent 7d550e5 commit 27346ca
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions kernel-shared/ctree.c
Original file line number Diff line number Diff line change
Expand Up @@ -2450,7 +2450,7 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
u32 nritems;
u32 orig_offset;
struct btrfs_disk_key disk_key;
char *buf;
char *buf = NULL;

leaf = path->nodes[0];
btrfs_item_key_to_cpu(leaf, &orig_key, path->slots[0]);
Expand All @@ -2469,11 +2469,13 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
/* if our item isn't there or got smaller, return now */
if (ret != 0 || item_size != btrfs_item_size(path->nodes[0],
path->slots[0])) {
return -EAGAIN;
ret = -EAGAIN;
goto error;
}

ret = split_leaf(trans, root, &orig_key, path, 0, 0);
BUG_ON(ret);
if (ret < 0)
goto error;

BUG_ON(btrfs_leaf_free_space(leaf) < sizeof(struct btrfs_item));
leaf = path->nodes[0];
Expand All @@ -2484,7 +2486,10 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,


buf = kmalloc(item_size, GFP_NOFS);
BUG_ON(!buf);
if (!buf) {
ret = -ENOMEM;
goto error;
}
read_extent_buffer(leaf, buf, btrfs_item_ptr_offset(leaf,
path->slots[0]), item_size);
slot = path->slots[0] + 1;
Expand Down Expand Up @@ -2530,6 +2535,10 @@ int btrfs_split_item(struct btrfs_trans_handle *trans,
}
kfree(buf);
return ret;
error:
kfree(buf);
btrfs_release_path(path);
return ret;
}

void btrfs_truncate_item(struct btrfs_path *path, u32 new_size, int from_end)
Expand Down

0 comments on commit 27346ca

Please sign in to comment.