diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-22 06:43:17 -0400 |
| commit | bf3c0e5e7102f5787d693379d9d384b813fe890b (patch) | |
| tree | aa48fc57dee9ecdf99918affa38d1b06be41419a /fs/btrfs/volumes.c | |
| parent | 32251b07d532174d66941488c112ec046f646157 (diff) | |
| parent | 976bc5e2aceedef13e0ba1f0e6e372a22164aa0c (diff) | |
| download | kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.gz kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.tar.bz2 kernel_replicant_linux-bf3c0e5e7102f5787d693379d9d384b813fe890b.zip | |
Merge branch 'x86-seves-for-paolo' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into HEAD
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index ee96c5869f57..214856c4ccb1 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4462,6 +4462,7 @@ int btrfs_uuid_scan_kthread(void *data) goto skip; } update_tree: + btrfs_release_path(path); if (!btrfs_is_empty_uuid(root_item.uuid)) { ret = btrfs_uuid_tree_add(trans, root_item.uuid, BTRFS_UUID_KEY_SUBVOL, @@ -4486,6 +4487,7 @@ update_tree: } skip: + btrfs_release_path(path); if (trans) { ret = btrfs_end_transaction(trans); trans = NULL; @@ -4493,7 +4495,6 @@ skip: break; } - btrfs_release_path(path); if (key.offset < (u64)-1) { key.offset++; } else if (key.type < BTRFS_ROOT_ITEM_KEY) { |