diff options
| author | Fabian-Gruenbichler <[email protected]> | 2024-03-22 00:38:24 +0100 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2024-04-22 09:23:23 -0700 |
| commit | 3fb0942cc5fb216ac733da94930e11a64e589d38 (patch) | |
| tree | 37ebe2dca6625609ce22ea1671cc11ecf1bdac12 | |
| parent | fa2cbd40078f36ac17af6c2eafd0aa15c3f9b37b (diff) | |
udev: correctly handle partition #16 and later
If a zvol has more than 15 partitions, the minor device number exhausts
the slot count reserved for partitions next to the zvol itself. As a
result, the minor number cannot be used to determine the partition
number for the higher partition, and doing so results in wrong named
symlinks being generated by udev.
Since the partition number is encoded in the block device name anyway,
let's just extract it from there instead.
Reviewed-by: Tony Hutter <[email protected]>
Reviewed by: Brian Behlendorf <[email protected]>
Reviewed-by: Tino Reichardt <[email protected]>
Signed-off-by: Fabian Grünbichler <[email protected]>
Closes #15904
Closes #15970
| -rw-r--r-- | udev/zvol_id.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/udev/zvol_id.c b/udev/zvol_id.c index 5960b9787..609349594 100644 --- a/udev/zvol_id.c +++ b/udev/zvol_id.c @@ -51,7 +51,7 @@ const char *__asan_default_options(void) { int main(int argc, const char *const *argv) { - if (argc != 2) { + if (argc != 2 || strncmp(argv[1], "/dev/zd", 7) != 0) { fprintf(stderr, "usage: %s /dev/zdX\n", argv[0]); return (1); } @@ -72,9 +72,10 @@ main(int argc, const char *const *argv) return (1); } - unsigned int dev_part = minor(sb.st_rdev) % ZVOL_MINORS; - if (dev_part != 0) - sprintf(zvol_name + strlen(zvol_name), "-part%u", dev_part); + const char *dev_part = strrchr(dev_name, 'p'); + if (dev_part != NULL) { + sprintf(zvol_name + strlen(zvol_name), "-part%s", dev_part + 1); + } for (size_t i = 0; i < strlen(zvol_name); ++i) if (isblank(zvol_name[i])) |