diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-30 06:01:03 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-30 06:01:03 +0200 |
| commit | 9fb58390e2584fc06676753b7eafca91a863faa4 (patch) | |
| tree | aa94c6ee2ae7d12aac3762c45973a57e64da9cf4 /0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch | |
| parent | 0c9c09e2873354ef28a3b5a74acd8884292e6fc4 (diff) | |
| parent | 67f313c852f247a960a3b75eeff433ee42cd388c (diff) | |
| download | kernel-9fb58390e2584fc06676753b7eafca91a863faa4.tar.gz kernel-9fb58390e2584fc06676753b7eafca91a863faa4.tar.xz kernel-9fb58390e2584fc06676753b7eafca91a863faa4.zip | |
merge master
Diffstat (limited to '0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch')
| -rw-r--r-- | 0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch b/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch deleted file mode 100644 index 5b9bd2cc1..000000000 --- a/0001-btrfs-fix-memory-leak-of-transaction-when-deleting-u.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5150bf19635c335109542c19f6b84c7813810873 Mon Sep 17 00:00:00 2001 -From: Filipe Manana <fdmanana@suse.com> -Date: Fri, 17 Apr 2020 16:36:15 +0100 -Subject: [PATCH] btrfs: fix memory leak of transaction when deleting unused - block group - -When cleaning pinned extents right before deleting an unused block group, -we check if there's still a previous transaction running and if so we -increment its reference count before using it for cleaning pinned ranges -in its pinned extents iotree. However we ended up never decrementing the -reference count after using the transaction, resulting in a memory leak. - -Fix it by decrementing the reference count. - -Fixes: fe119a6eeb6705 ("btrfs: switch to per-transaction pinned extents") -Signed-off-by: Filipe Manana <fdmanana@suse.com> -Reviewed-by: David Sterba <dsterba@suse.com> -Signed-off-by: David Sterba <dsterba@suse.com> ---- - fs/btrfs/block-group.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c -index 47f66c6a7d7f..af9e9a008724 100644 ---- a/fs/btrfs/block-group.c -+++ b/fs/btrfs/block-group.c -@@ -1288,11 +1288,15 @@ static bool clean_pinned_extents(struct btrfs_trans_handle *trans, - if (ret) - goto err; - mutex_unlock(&fs_info->unused_bg_unpin_mutex); -+ if (prev_trans) -+ btrfs_put_transaction(prev_trans); - - return true; - - err: - mutex_unlock(&fs_info->unused_bg_unpin_mutex); -+ if (prev_trans) -+ btrfs_put_transaction(prev_trans); - btrfs_dec_block_group_ro(bg); - return false; - } --- -2.26.2 - |