From: Karel Zak <kzak@redhat.com>
Date: Wed, 1 Apr 2015 10:23:23 +0000 (+0200)
Subject: lsblk: don't ignore dependences for partitioned devies
X-Git-Tag: v2.27-rc1~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296dc15c244211e0e2a329286555c5060f337233;p=thirdparty%2Futil-linux.git

lsblk: don't ignore dependences for partitioned devies

The code only lists partitions, but ignore another dependencies
on whole-disk device:

	$ lsblk /dev/sdb
	NAME   MAJ:MIN RM   SIZE RO TYPE MOUNTPOINT
	sdb      8:16   0 298.1G  0 disk
	└─sdb1   8:17   0 298.1G  0 part

	$ ls /sys/block/sdb/holders/
	dm-0

fixed version:

	$ lsblk /dev/sdb
	NAME        MAJ:MIN RM   SIZE RO TYPE  MOUNTPOINT
	sdb           8:16   0 298.1G  0 disk
	├─sdb1        8:17   0 298.1G  0 part
	└─mpatha    253:0    0 298.1G  0 mpath
	  └─mpatha1 253:1    0 298.1G  0 part

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 8781b96cd9..6c716ea958 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1387,9 +1387,10 @@ static int process_blkdev(struct blkdev_cxt *cxt, struct blkdev_cxt *parent,
 			  int do_partitions, const char *part_name)
 {
 	if (do_partitions && cxt->npartitions)
-		return list_partitions(cxt, parent, part_name);
+		list_partitions(cxt, parent, part_name);		/* partitoins + whole-disk */
+	else
+		fill_table_line(cxt, parent ? parent->scols_line : NULL); /* whole-disk only */
 
-	fill_table_line(cxt, parent ? parent->scols_line : NULL);
 	return list_deps(cxt);
 }