]> git.proxmox.com Git - zfsonlinux.git/blob - zfs-patches/0009-dmu_objset-release-bonus-buffer-in-failure-path.patch
add remaining zfs-0.7.6 changes as patches
[zfsonlinux.git] / zfs-patches / 0009-dmu_objset-release-bonus-buffer-in-failure-path.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Gvozden Neskovic <neskovic@gmail.com>
3 Date: Wed, 30 Aug 2017 21:09:18 +0200
4 Subject: [PATCH] dmu_objset: release bonus buffer in failure path
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 Reported by kmemleak during testing of a new patch:
10
11 ```
12 unreferenced object 0xffff9f1c12e38800 (size 1024):
13 comm "z_upgrade", pid 17842, jiffies 4296870904 (age 8746.268s)
14 backtrace:
15 kmemleak_alloc+0x7a/0x100
16 __kmalloc_node+0x26c/0x510
17 range_tree_create+0x39/0xa0 [zfs]
18 dmu_zfetch_init+0x73/0xe0 [zfs]
19 dnode_create+0x12c/0x3b0 [zfs]
20 dnode_hold_impl+0x1096/0x1130 [zfs]
21 dnode_hold+0x23/0x30 [zfs]
22 dmu_bonus_hold_impl+0x6b/0x370 [zfs]
23 dmu_bonus_hold+0x1e/0x30 [zfs]
24 dmu_objset_space_upgrade+0x114/0x310 [zfs]
25 dmu_objset_userobjspace_upgrade_cb+0xd8/0x150 [zfs]
26 dmu_objset_upgrade_task_cb+0x136/0x1e0 [zfs]
27 kthread+0x119/0x150
28 ```
29
30 Reviewed-by: George Melikov <mail@gmelikov.ru>
31 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
32 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
33 Signed-off-by: Gvozden Neskovic <neskovic@gmail.com>
34 Closes #6575
35 (cherry picked from commit a94447ddf3e8632e1e0476a3b1c985f41a0ae899)
36 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
37 ---
38 module/zfs/dmu_objset.c | 1 +
39 1 file changed, 1 insertion(+)
40
41 diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
42 index 9a7a6968d..3425d542f 100644
43 --- a/module/zfs/dmu_objset.c
44 +++ b/module/zfs/dmu_objset.c
45 @@ -1853,6 +1853,7 @@ dmu_objset_space_upgrade(objset_t *os)
46 dmu_tx_hold_bonus(tx, obj);
47 objerr = dmu_tx_assign(tx, TXG_WAIT);
48 if (objerr != 0) {
49 + dmu_buf_rele(db, FTAG);
50 dmu_tx_abort(tx);
51 continue;
52 }
53 --
54 2.14.2
55