SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev: use block_device_is_whole_disk()

Browse Source 
No functional changes, just refactoring.

Note, this also makes synthesize_change() propagate the error from
synthesize_change_one(). However, the caller of synthesize_change()
ignores the failure anyway, hence the change does not take any effect.
This commit is contained in:
Yu Watanabe
2022-09-20 09:44:19 +02:00
committed by Daan De Meyer
parent 83b94cf10e
commit 2f9d231738
3 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/blockdev-util.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "missing_magic.h"
#include "parse-util.h"
static int block_device_is_whole_disk(sd_device *dev) {
int block_device_is_whole_disk(sd_device *dev) {
const char *s;
int r;
src/shared/blockdev-util.h
+1
View File
@@ -14,6 +14,7 @@
#define xsprintf_sys_block_path(buf, suffix, devno) \
xsprintf(buf, "/sys/dev/block/%u:%u%s", major(devno), minor(devno), strempty(suffix))
int block_device_is_whole_disk(sd_device *dev);
int block_device_get_whole_disk(sd_device *dev, sd_device **ret);
int block_get_whole_disk(dev_t d, dev_t *ret);
src/udev/udevd.c
+28 -36
View File
@@ -1362,52 +1362,44 @@ static int synthesize_change_one(sd_device *dev, sd_device *target) {
}
static int synthesize_change(sd_device *dev) {
const char *subsystem, *sysname, *devtype;
int r;
r = sd_device_get_subsystem(dev, &subsystem);
if (r < 0)
return r;
r = sd_device_get_devtype(dev, &devtype);
if (r < 0)
return r;
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
bool part_table_read;
const char *sysname;
sd_device *d;
int r, k;
r = sd_device_get_sysname(dev, &sysname);
if (r < 0)
return r;
if (streq_ptr(subsystem, "block") &&
streq_ptr(devtype, "disk") &&
!startswith(sysname, "dm-")) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
bool part_table_read;
sd_device *d;
if (startswith(sysname, "dm-") || block_device_is_whole_disk(dev) <= 0)
return synthesize_change_one(dev, dev);
r = blockdev_reread_partition_table(dev);
if (r < 0)
log_device_debug_errno(dev, r, "Failed to re-read partition table, ignoring: %m");
part_table_read = r >= 0;
r = blockdev_reread_partition_table(dev);
if (r < 0)
log_device_debug_errno(dev, r, "Failed to re-read partition table, ignoring: %m");
part_table_read = r >= 0;
/* search for partitions */
r = partition_enumerator_new(dev, &e);
if (r < 0)
return r;
/* search for partitions */
r = partition_enumerator_new(dev, &e);
if (r < 0)
return r;
/* We have partitions and re-read the table, the kernel already sent out a "change"
* event for the disk, and "remove/add" for all partitions. */
if (part_table_read && sd_device_enumerator_get_device_first(e))
return 0;
/* We have partitions and re-read the table, the kernel already sent out a "change"
* event for the disk, and "remove/add" for all partitions. */
if (part_table_read && sd_device_enumerator_get_device_first(e))
return 0;
/* We have partitions but re-reading the partition table did not work, synthesize
* "change" for the disk and all partitions. */
(void) synthesize_change_one(dev, dev);
FOREACH_DEVICE(e, d)
(void) synthesize_change_one(dev, d);
} else
(void) synthesize_change_one(dev, dev);
/* We have partitions but re-reading the partition table did not work, synthesize
* "change" for the disk and all partitions. */
r = synthesize_change_one(dev, dev);
FOREACH_DEVICE(e, d) {
k = synthesize_change_one(dev, d);
if (k < 0 && r >= 0)
r = k;
}
return 0;
return r;
}
static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userdata) {