Btrfs: log recovery, don't unlink inode always on error
PATCH 1/1 Btrfs: log recovery, don't unlink inode always on error
If we get any error while doing a dir index/item lookup in the log tree, we were always unlinking the corresponding inode in the subvolume. It makes sense to unlink only if the lookup failed to find the dir index/item, which corresponds to NULL or -ENOENT, and not when other errors happen (like a transient -ENOMEM or -EIO).
Signed-off-by Filipe David Borba Manana <[email protected]>
--- fs/btrfs/tree-log.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +4 -1
@@ -1832,7 +1832,7 @@ again: dir_key->offset, name, name_len, 0); } -if (IS_ERR_OR_NULL (log_di)) { +if (!log_di || (IS_ERR (log_di) &&PTR_ERR (log_di) == -ENOENT )) {btrfs_dir_item_key_to_cpu (eb, di, &location);btrfs_release_path (path);btrfs_release_path (log_path);
@@ -1869,6 +1869,9 @@ again: goto again; ret =0 ; goto out; + }else if (IS_ERR (log_di)) { +kfree (name); +return PTR_ERR (log_di); }btrfs_release_path (log_path);kfree (name);
Signature · 1 line
1.7.9.5