summaryrefslogtreecommitdiffstats
path: root/misc-utils/lsblk-devtree.c
diff options
context:
space:
mode:
authorKarel Zak2018-10-18 13:57:46 +0200
committerKarel Zak2018-12-07 12:33:34 +0100
commit10501add02abf12d41246c04a81ac599179266c7 (patch)
tree81e27d43a321e8a86b71930d61901472bf020b83 /misc-utils/lsblk-devtree.c
parentlsblk: make device_get_data() more generic (diff)
downloadkernel-qcow2-util-linux-10501add02abf12d41246c04a81ac599179266c7.tar.gz
kernel-qcow2-util-linux-10501add02abf12d41246c04a81ac599179266c7.tar.xz
kernel-qcow2-util-linux-10501add02abf12d41246c04a81ac599179266c7.zip
lsblk: remember whole-disk, remove unused struct member
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk-devtree.c')
-rw-r--r--misc-utils/lsblk-devtree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/misc-utils/lsblk-devtree.c b/misc-utils/lsblk-devtree.c
index 9a6dba0e1..aab01d3e3 100644
--- a/misc-utils/lsblk-devtree.c
+++ b/misc-utils/lsblk-devtree.c
@@ -12,7 +12,7 @@ void lsblk_reset_iter(struct lsblk_iter *itr, int direction)
itr->direction = direction;
}
-struct lsblk_device *lsblk_new_device(struct lsblk_devtree *tree)
+struct lsblk_device *lsblk_new_device()
{
struct lsblk_device *dev;
@@ -23,7 +23,6 @@ struct lsblk_device *lsblk_new_device(struct lsblk_devtree *tree)
dev->refcount = 1;
dev->removable = -1;
dev->discard_granularity = (uint64_t) -1;
- dev->tree = tree;
INIT_LIST_HEAD(&dev->deps);
INIT_LIST_HEAD(&dev->ls_roots);
@@ -77,6 +76,8 @@ void lsblk_unref_device(struct lsblk_device *dev)
device_remove_dependences(dev);
lsblk_device_free_properties(dev->properties);
+ lsblk_unref_device(dev->wholedisk);
+
free(dev->name);
free(dev->dm_name);
free(dev->filename);