diff options
| author | Karel Zak | 2018-12-07 12:29:50 +0100 |
|---|---|---|
| committer | Karel Zak | 2018-12-07 12:57:49 +0100 |
| commit | 0bd05f5ee4876ffd13c98acd56c2bff9971f28f1 (patch) | |
| tree | f0635d4af03006fa5cf90c03ee4ed7a32dfd89d9 /misc-utils/lsblk.h | |
| parent | libsmartcols: add grouping API docs (diff) | |
| download | kernel-qcow2-util-linux-0bd05f5ee4876ffd13c98acd56c2bff9971f28f1.tar.gz kernel-qcow2-util-linux-0bd05f5ee4876ffd13c98acd56c2bff9971f28f1.tar.xz kernel-qcow2-util-linux-0bd05f5ee4876ffd13c98acd56c2bff9971f28f1.zip | |
lsblk: add --merge
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/lsblk.h')
| -rw-r--r-- | misc-utils/lsblk.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/misc-utils/lsblk.h b/misc-utils/lsblk.h index 8f8a89dfd..a043e7fd7 100644 --- a/misc-utils/lsblk.h +++ b/misc-utils/lsblk.h @@ -45,6 +45,7 @@ struct lsblk { unsigned int all_devices:1; /* print all devices, including empty */ unsigned int bytes:1; /* print SIZE in bytes */ unsigned int inverse:1; /* print inverse dependencies */ + unsigned int merge:1; /* merge sub-trees */ unsigned int nodeps:1; /* don't print slaves/holders */ unsigned int scsi:1; /* print only device with HCTL (SCSI) */ unsigned int paths:1; /* print devnames with "/dev" prefix */ @@ -93,6 +94,8 @@ struct lsblk_device { struct lsblk_device *wholedisk; /* for partitions */ + struct libscols_line *scols_line; + struct lsblk_devprop *properties; struct stat st; @@ -120,6 +123,7 @@ struct lsblk_device { unsigned int is_mounted : 1, is_swap : 1, + is_printed : 1, udev_requested : 1, blkid_requested : 1; }; @@ -196,6 +200,12 @@ int lsblk_device_next_child(struct lsblk_device *dev, struct lsblk_iter *itr, struct lsblk_device **child); +int lsblk_device_is_last_parent(struct lsblk_device *dev, struct lsblk_device *parent); +int lsblk_device_next_parent( + struct lsblk_device *dev, + struct lsblk_iter *itr, + struct lsblk_device **parent); + struct lsblk_devtree *lsblk_new_devtree(void); void lsblk_ref_devtree(struct lsblk_devtree *tr); void lsblk_unref_devtree(struct lsblk_devtree *tr); |