diff options
| author |   Filipe Manana <fdmanana@suse.com> | 2021-10-01 13:52:31 +0100 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2021-10-07 22:06:23 +0200 |
| commit | e15ac6413745e3def00e663de00aea5a717311c1 (patch) | |
| tree | a71b5fc0310e02c4df08f75e28dbdfbbe5f18603 /fs | |
| parent | btrfs: deal with errors when checking if a dir entry exists during log replay (diff) | |
| download | linux-dev-e15ac6413745e3def00e663de00aea5a717311c1.tar.xz linux-dev-e15ac6413745e3def00e663de00aea5a717311c1.zip | |
btrfs: deal with errors when replaying dir entry during log replay
At replay_one_one(), we are treating any error returned from
btrfs_lookup_dir_item() or from btrfs_lookup_dir_index_item() as meaning
that there is no existing directory entry in the fs/subvolume tree.
This is not correct since we can get errors such as, for example, -EIO
when reading extent buffers while searching the fs/subvolume's btree.
So fix that and return the error to the caller when it is not -ENOENT.
CC: stable@vger.kernel.org # 4.14+
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 491d4ba22cfc..007b5051b2f1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1988,7 +1988,14 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, ret = -EINVAL; goto out; } - if (IS_ERR_OR_NULL(dst_di)) { + + if (dst_di == ERR_PTR(-ENOENT)) + dst_di = NULL; + + if (IS_ERR(dst_di)) { + ret = PTR_ERR(dst_di); + goto out; + } else if (!dst_di) { /* we need a sequence number to insert, so we only * do inserts for the BTRFS_DIR_INDEX_KEY types */ |