summaryrefslogtreecommitdiffstats
path: root/misc-utils/lsblk.c
diff options
context:
space:
mode:
authorKarel Zak2018-10-15 14:16:32 +0200
committerKarel Zak2018-12-07 12:32:57 +0100
commit9b4c6486122c2f7545e1ab8b21a70a93f7257c69 (patch)
tree5f5274c988030b7609a6601aed0b0ba7fe7d81a9 /misc-utils/lsblk.c
parentlsblk: fix devtree deallocation (diff)
downloadkernel-qcow2-util-linux-9b4c6486122c2f7545e1ab8b21a70a93f7257c69.tar.gz
kernel-qcow2-util-linux-9b4c6486122c2f7545e1ab8b21a70a93f7257c69.tar.xz
kernel-qcow2-util-linux-9b4c6486122c2f7545e1ab8b21a70a93f7257c69.zip
lsblk: remove unused reset_device()
Now all is maintained by reference counting ion the devtree. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk.c')
-rw-r--r--misc-utils/lsblk.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index edc9a20e0..4f13e8b2a 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -317,24 +317,6 @@ static int column_id_to_number(int id)
return -1;
}
-static void reset_device(struct lsblk_device *dev)
-{
- if (!dev)
- return;
-
- DBG(DEV, ul_debugobj(dev, "reset"));
-
- free(dev->name);
- free(dev->dm_name);
- free(dev->filename);
- free(dev->mountpoint);
-
- lsblk_device_free_properties(dev->properties);
- ul_unref_path(dev->sysfs);
-
- memset(dev, 0, sizeof(*dev));
-}
-
static int is_dm(const char *name)
{
return strncmp(name, "dm-", 3) ? 0 : 1;
@@ -1168,7 +1150,6 @@ static int list_partitions(struct lsblk_device *wholedisk_dev, struct lsblk_devi
process_blkdev(&part_dev, wholedisk_dev, 0, NULL);
}
next:
- reset_device(&part_dev);
r = 0;
}
@@ -1247,7 +1228,6 @@ static int list_deps(struct lsblk_device *dev)
* if the dependence is on whole-disk */
process_blkdev(&dep, dev, lsblk->inverse ? 0 : 1, NULL);
}
- reset_device(&dep);
}
closedir(dir);
@@ -1386,11 +1366,6 @@ static int process_one_device(char *devname)
rc = 0;
leave:
free(name);
- reset_device(&dev);
-
- if (real_part)
- reset_device(&parent);
-
return rc;
}