From b9da1532546630cda5d9dd9863ba2e6477a60bba Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 30 Jun 2017 11:49:12 +0200 Subject: [PATCH] libfdisk: add fdisk_device_is_used() Signed-off-by: Karel Zak --- libfdisk/docs/libfdisk-sections.txt | 1 + libfdisk/src/context.c | 34 +++++++++++++++++++++++++++++ libfdisk/src/libfdisk.h.in | 1 + libfdisk/src/libfdisk.sym | 1 + 4 files changed, 37 insertions(+) diff --git a/libfdisk/docs/libfdisk-sections.txt b/libfdisk/docs/libfdisk-sections.txt index 7f9b5e51b..337e0a643 100644 --- a/libfdisk/docs/libfdisk-sections.txt +++ b/libfdisk/docs/libfdisk-sections.txt @@ -287,6 +287,7 @@ fdisk_context fdisk_assign_device fdisk_deassign_device fdisk_reassign_device +fdisk_device_is_used fdisk_enable_bootbits_protection fdisk_enable_details fdisk_enable_listonly diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c index e8dfa0e69..1ebc1b981 100644 --- a/libfdisk/src/context.c +++ b/libfdisk/src/context.c @@ -2,6 +2,8 @@ # include #endif +#include "blkdev.h" +#include "loopdev.h" #include "fdiskP.h" @@ -733,6 +735,38 @@ int fdisk_reread_partition_table(struct fdisk_context *cxt) } +/** + * fdisk_device_is_used: + * @cxt: context + * + * On systems where is no BLKRRPART ioctl the function returns zero and + * sets errno to ENOSYS. + * + * Returns: 1 if the device assigned to the context is used by system, or 0. + */ +int fdisk_device_is_used(struct fdisk_context *cxt) +{ + int rc = 0; + + assert(cxt); + assert(cxt->dev_fd >= 0); + + errno = 0; + +#ifdef BLKRRPART + /* it seems kernel always return EINVAL for BLKRRPART on loopdevices */ + if (S_ISBLK(cxt->dev_st.st_mode) + && major(cxt->dev_st.st_rdev) != LOOPDEV_MAJOR) { + DBG(CXT, ul_debugobj(cxt, "calling re-read ioctl")); + rc = ioctl(cxt->dev_fd, BLKRRPART) != 0; + } +#else + errno = ENOSYS; +#endif + DBG(CXT, ul_debugobj(cxt, "device used: %s [errno=%d]", rc ? "TRUE" : "FALSE", errno)); + return rc; +} + /** * fdisk_is_readonly: * @cxt: context diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in index 11b025c32..c00e1c072 100644 --- a/libfdisk/src/libfdisk.h.in +++ b/libfdisk/src/libfdisk.h.in @@ -185,6 +185,7 @@ int fdisk_reassign_device(struct fdisk_context *cxt); int fdisk_is_readonly(struct fdisk_context *cxt); int fdisk_is_regfile(struct fdisk_context *cxt); +int fdisk_device_is_used(struct fdisk_context *cxt); int fdisk_enable_details(struct fdisk_context *cxt, int enable); int fdisk_is_details(struct fdisk_context *cxt); diff --git a/libfdisk/src/libfdisk.sym b/libfdisk/src/libfdisk.sym index 7063649b8..7b43f320e 100644 --- a/libfdisk/src/libfdisk.sym +++ b/libfdisk/src/libfdisk.sym @@ -285,4 +285,5 @@ FDISK_2.30 { FDISK_2.31 { fdisk_reassign_device; + fdisk_device_is_used; } FDISK_2.30;