From 0f70bde9bef1ed73df13155c2728c9632f5f51fd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 1 Mar 2016 15:41:53 -0500 Subject: [PATCH] Get rid of the fd in make_blockdev_path() Since we don't do the nvme ioctl any more, we don't need this. Signed-off-by: Peter Jones --- src/creator.c | 2 +- src/linux.c | 2 +- src/linux.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/creator.c b/src/creator.c index dcbdea4..bab4e7a 100644 --- a/src/creator.c +++ b/src/creator.c @@ -201,7 +201,7 @@ efi_va_generate_file_device_path_from_esp(uint8_t *buf, ssize_t size, * symlink from /sys/dev/block/$major:$minor and get it * from there. */ - sz = make_blockdev_path(buf, size, fd, &info); + sz = make_blockdev_path(buf, size, &info); if (sz < 0) return -1; off += sz; diff --git a/src/linux.c b/src/linux.c index 084e9c2..476d7e4 100644 --- a/src/linux.c +++ b/src/linux.c @@ -665,7 +665,7 @@ make_pci_path(uint8_t *buf, ssize_t size, char *pathstr, ssize_t *pathoff) int __attribute__((__visibility__ ("hidden"))) -make_blockdev_path(uint8_t *buf, ssize_t size, int fd, struct disk_info *info) +make_blockdev_path(uint8_t *buf, ssize_t size, struct disk_info *info) { char *linkbuf = NULL; char *driverbuf = NULL; diff --git a/src/linux.h b/src/linux.h index 539fb23..3c480df 100644 --- a/src/linux.h +++ b/src/linux.h @@ -98,8 +98,8 @@ enum _interface_type {interface_type_unknown, extern int eb_disk_info_from_fd(int fd, struct disk_info *info); extern int set_disk_and_part_name(struct disk_info *info); -extern int make_blockdev_path(uint8_t *buf, ssize_t size, int fd, - struct disk_info *info); +extern int make_blockdev_path(uint8_t *buf, ssize_t size, + struct disk_info *info); extern int eb_nvme_ns_id(int fd, uint32_t *ns_id); -- 2.11.0