diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2021-10-05 23:35:24 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-10-26 20:08:05 +0300 |
| commit | 9a35fc9542fa6c220d69987612b88c54cba2bc33 (patch) | |
| tree | c81496194c5babfe11b55a972ba5b2493e8ef9f6 /fs/btrfs/inode.c | |
| parent | ba51e2a11e389a1e928e16d616c1276423c3a89e (diff) | |
| download | linux-9a35fc9542fa6c220d69987612b88c54cba2bc33.tar.xz | |
btrfs: change error handling for btrfs_delete_*_in_log
Currently we will abort the transaction if we get a random error (like
-EIO) while trying to remove the directory entries from the root log
during rename.
However since these are simply log tree related errors, we can mark the
trans as needing a full commit. Then if the error was truly
catastrophic we'll hit it during the normal commit and abort as
appropriate.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 28e0ad1478c3..1e083ecd6951 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4120,19 +4120,9 @@ skip_backref: goto err; } - ret = btrfs_del_inode_ref_in_log(trans, root, name, name_len, inode, - dir_ino); - if (ret != 0 && ret != -ENOENT) { - btrfs_abort_transaction(trans, ret); - goto err; - } - - ret = btrfs_del_dir_entries_in_log(trans, root, name, name_len, dir, - index); - if (ret == -ENOENT) - ret = 0; - else if (ret) - btrfs_abort_transaction(trans, ret); + btrfs_del_inode_ref_in_log(trans, root, name, name_len, inode, + dir_ino); + btrfs_del_dir_entries_in_log(trans, root, name, name_len, dir, index); /* * If we have a pending delayed iput we could end up with the final iput |