morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

fdisk-util: Make fdisk_new_context_fd() more generic

Browse Source 
Let's make this an openat() style function so we can also pass a
device path.
This commit is contained in:
Daan De Meyer
2023-08-14 10:27:57 +02:00
parent 59120e89d8
commit fd9fe57a26
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/home/homework-luks.c
View File

@@ -1870,7 +1870,7 @@ static int make_partition_table(
if (r < 0)
return log_error_errno(r, "Failed to initialize partition type: %m");
r = fdisk_new_context_fd(fd, /* read_only= */ false, sector_size, &c);
r = fdisk_new_context_at(fd, /* path= */ NULL, /* read_only= */ false, sector_size, &c);
if (r < 0)
return log_error_errno(r, "Failed to open device: %m");
@@ -2698,7 +2698,7 @@ static int prepare_resize_partition(
return 0;
}
r = fdisk_new_context_fd(fd, /* read_only= */ false, UINT32_MAX, &c);
r = fdisk_new_context_at(fd, /* path= */ NULL, /* read_only= */ false, UINT32_MAX, &c);
if (r < 0)
return log_error_errno(r, "Failed to open device: %m");
@@ -2855,7 +2855,7 @@ static int apply_resize_partition(
if ((size_t) n != ssz * 2)
return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short write while wiping partition table.");
r = fdisk_new_context_fd(fd, /* read_only= */ false, ssz, &c);
r = fdisk_new_context_at(fd, /* path= */ NULL, /* read_only= */ false, ssz, &c);
if (r < 0)
return log_error_errno(r, "Failed to open device: %m");

4
src/partition/repart.c
View File

@@ -1924,7 +1924,7 @@ static int context_copy_from_one(Context *context, const char *src) {
if (r < 0)
return log_error_errno(r, "%s is not a file: %m", src);
r = fdisk_new_context_fd(fd, /* read_only = */ true, /* sector_size = */ UINT32_MAX, &c);
r = fdisk_new_context_at(fd, /* path = */ NULL, /* read_only = */ true, /* sector_size = */ UINT32_MAX, &c);
if (r < 0)
return log_error_errno(r, "Failed to create fdisk context: %m");
@@ -6931,7 +6931,7 @@ static int resize_pt(int fd, uint64_t sector_size) {
* possession of the enlarged backing file. For this it suffices to open the device with libfdisk and
* immediately write it again, with no changes. */
r = fdisk_new_context_fd(fd, /* read_only= */ false, sector_size, &c);
r = fdisk_new_context_at(fd, /* path= */ NULL, /* read_only= */ false, sector_size, &c);
if (r < 0)
return log_error_errno(r, "Failed to open device '%s': %m", FORMAT_PROC_FD_PATH(fd));

20
src/shared/fdisk-util.c
View File

@@ -8,26 +8,34 @@
#if HAVE_LIBFDISK
int fdisk_new_context_fd(
int fd,
int fdisk_new_context_at(
int dir_fd,
const char *path,
bool read_only,
uint32_t sector_size,
struct fdisk_context **ret) {
_cleanup_(fdisk_unref_contextp) struct fdisk_context *c = NULL;
_cleanup_close_ int fd = -EBADF;
int r;
assert(dir_fd >= 0 || dir_fd == AT_FDCWD);
assert(ret);
if (fd < 0)
return -EBADF;
if (!isempty(path)) {
fd = openat(dir_fd, path, (read_only ? O_RDONLY : O_RDWR)|O_CLOEXEC);
if (fd < 0)
return -errno;
dir_fd = fd;
}
c = fdisk_new_context();
if (!c)
return -ENOMEM;
if (sector_size == UINT32_MAX) {
r = probe_sector_size_prefer_ioctl(fd, &sector_size);
r = probe_sector_size_prefer_ioctl(dir_fd, &sector_size);
if (r < 0)
return r;
}
@@ -38,7 +46,7 @@ int fdisk_new_context_fd(
return r;
}
r = fdisk_assign_device(c, FORMAT_PROC_FD_PATH(fd), read_only);
r = fdisk_assign_device(c, FORMAT_PROC_FD_PATH(dir_fd), read_only);
if (r < 0)
return r;

2
src/shared/fdisk-util.h
View File

@@ -14,7 +14,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_partition*, fdisk_unref_partition,
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_parttype*, fdisk_unref_parttype, NULL);
DEFINE_TRIVIAL_CLEANUP_FUNC_FULL(struct fdisk_table*, fdisk_unref_table, NULL);
int fdisk_new_context_fd(int fd, bool read_only, uint32_t sector_size, struct fdisk_context **ret);
int fdisk_new_context_at(int dir_fd, const char *path, bool read_only, uint32_t sector_size, struct fdisk_context **ret);
int fdisk_partition_get_uuid_as_id128(struct fdisk_partition *p, sd_id128_t *ret);
int fdisk_partition_get_type_as_id128(struct fdisk_partition *p, sd_id128_t *ret);