d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udev: zvol_id: simplify/modernise

Browse Source 
zero-alloc, sensibler errors, don't close (or free) before exit.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13337
This commit is contained in:
наб 2022-05-11 19:58:19 +02:00 committed by GitHub
parent 1f5bc12893
commit 5a142533f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
udev/zvol_id.c
View File

@ -24,16 +24,14 @@
*/ */
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <linux/ioctl.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/zfs_znode.h>
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#if defined(ZFS_ASAN_ENABLED) #if defined(ZFS_ASAN_ENABLED)
/* /*
@ -50,80 +48,39 @@ const char *__asan_default_options(void) {
} }
#endif #endif
static int
ioctl_get_msg(char *var, int fd)
{
int ret;
char msg[ZFS_MAX_DATASET_NAME_LEN];
ret = ioctl(fd, BLKZNAME, msg);
if (ret < 0) {
return (ret);
}
snprintf(var, ZFS_MAX_DATASET_NAME_LEN, "%s", msg);
return (ret);
}
int int
main(int argc, char **argv) main(int argc, const char *const *argv)
{ {
int fd = -1, ret = 0, status = EXIT_FAILURE; if (argc != 2) {
char zvol_name[ZFS_MAX_DATASET_NAME_LEN]; fprintf(stderr, "usage: %s /dev/zdX\n", argv[0]);
char *zvol_name_part = NULL; return (1);
char *dev_name; }
struct stat64 statbuf; const char *dev_name = argv[1];
int dev_minor, dev_part;
int i;
if (argc < 2) { int fd;
fprintf(stderr, "Usage: %s /dev/zvol_device_node\n", argv[0]); struct stat sb;
goto fail; if ((fd = open(dev_name, O_RDONLY|O_CLOEXEC)) == -1 ||
fstat(fd, &sb) != 0) {
fprintf(stderr, "%s: %s\n", dev_name, strerror(errno));
return (1);
} }
dev_name = argv[1]; char zvol_name[MAXNAMELEN + strlen("-part") + 10];
ret = stat64(dev_name, &statbuf); if (ioctl(fd, BLKZNAME, zvol_name) == -1) {
if (ret != 0) { fprintf(stderr, "%s: BLKZNAME: %s\n",
fprintf(stderr, "Unable to access device file: %s\n", dev_name); dev_name, strerror(errno));
goto fail; return (1);
} }
dev_minor = minor(statbuf.st_rdev); unsigned int dev_part = minor(sb.st_rdev) % ZVOL_MINORS;
dev_part = dev_minor % ZVOL_MINORS; if (dev_part != 0)
sprintf(zvol_name + strlen(zvol_name), "-part%u", dev_part);
fd = open(dev_name, O_RDONLY); for (size_t i = 0; i < strlen(zvol_name); ++i)
if (fd < 0) { if (isblank(zvol_name[i]))
fprintf(stderr, "Unable to open device file: %s\n", dev_name); zvol_name[i] = '+';
goto fail;
}
ret = ioctl_get_msg(zvol_name, fd); puts(zvol_name);
if (ret < 0) {
fprintf(stderr, "ioctl_get_msg failed: %s\n", strerror(errno));
goto fail;
}
if (dev_part > 0)
ret = asprintf(&zvol_name_part, "%s-part%d", zvol_name,
dev_part);
else
ret = asprintf(&zvol_name_part, "%s", zvol_name);
if (ret == -1 || zvol_name_part == NULL) return (0);
goto fail;
for (i = 0; i < strlen(zvol_name_part); i++) {
if (isblank(zvol_name_part[i]))
zvol_name_part[i] = '+';
}
printf("%s\n", zvol_name_part);
status = EXIT_SUCCESS;
fail:
if (zvol_name_part)
free(zvol_name_part);
if (fd >= 0)
close(fd);
return (status);
} }