| From 714cd3e8cba6841220dce9063a7388a81de03825 Mon Sep 17 00:00:00 2001 |
| From: Josef Bacik <josef@toxicpanda.com> |
| Date: Fri, 6 Dec 2019 11:39:00 -0500 |
| Subject: btrfs: handle ENOENT in btrfs_uuid_tree_iterate |
| |
| From: Josef Bacik <josef@toxicpanda.com> |
| |
| commit 714cd3e8cba6841220dce9063a7388a81de03825 upstream. |
| |
| If we get an -ENOENT back from btrfs_uuid_iter_rem when iterating the |
| uuid tree we'll just continue and do btrfs_next_item(). However we've |
| done a btrfs_release_path() at this point and no longer have a valid |
| path. So increment the key and go back and do a normal search. |
| |
| CC: stable@vger.kernel.org # 4.4+ |
| Reviewed-by: Filipe Manana <fdmanana@suse.com> |
| Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> |
| Signed-off-by: Josef Bacik <josef@toxicpanda.com> |
| Reviewed-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: David Sterba <dsterba@suse.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/btrfs/uuid-tree.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/fs/btrfs/uuid-tree.c |
| +++ b/fs/btrfs/uuid-tree.c |
| @@ -332,6 +332,8 @@ again_search_slot: |
| } |
| if (ret < 0 && ret != -ENOENT) |
| goto out; |
| + key.offset++; |
| + goto again_search_slot; |
| } |
| item_size -= sizeof(subid_le); |
| offset += sizeof(subid_le); |