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

repart: Allow acquire shared lock on --copy-from files/devices

Browse Source 
We're not going to modify these, so no need for an exclusive lock.
This commit is contained in:
Daan De Meyer
2023-08-11 10:41:04 +02:00
parent 8c8c8fce4d
commit 3cdcf4e204
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/partition/repart.c
View File

@@ -1814,7 +1814,7 @@ static int find_verity_sibling(Context *context, Partition *p, VerityMode mode,
return 0;
}
static int context_open_and_lock_backing_fd(const char *node, int *backing_fd) {
static int context_open_and_lock_backing_fd(const char *node, int operation, int *backing_fd) {
_cleanup_close_ int fd = -EBADF;
assert(node);
@@ -1828,7 +1828,7 @@ static int context_open_and_lock_backing_fd(const char *node, int *backing_fd) {
return log_error_errno(errno, "Failed to open device '%s': %m", node);
/* Tell udev not to interfere while we are processing the device */
if (flock(fd, arg_dry_run ? LOCK_SH : LOCK_EX) < 0)
if (flock(fd, operation) < 0)
return log_error_errno(errno, "Failed to lock device '%s': %m", node);
log_debug("Device %s opened and locked.", node);
@@ -1917,7 +1917,7 @@ static int context_copy_from(Context *context) {
if (!arg_copy_from)
return 0;
r = context_open_and_lock_backing_fd(arg_copy_from, &fd);
r = context_open_and_lock_backing_fd(arg_copy_from, LOCK_SH, &fd);
if (r < 0)
return r;
@@ -2223,7 +2223,8 @@ static int context_load_partition_table(Context *context) {
else {
uint32_t ssz;
r = context_open_and_lock_backing_fd(context->node, &context->backing_fd);
r = context_open_and_lock_backing_fd(context->node, arg_dry_run ? LOCK_SH : LOCK_EX,
&context->backing_fd);
if (r < 0)
return r;
@@ -2270,7 +2271,9 @@ static int context_load_partition_table(Context *context) {
if (context->backing_fd < 0) {
/* If we have no fd referencing the device yet, make a copy of the fd now, so that we have one */
r = context_open_and_lock_backing_fd(FORMAT_PROC_FD_PATH(fdisk_get_devfd(c)), &context->backing_fd);
r = context_open_and_lock_backing_fd(FORMAT_PROC_FD_PATH(fdisk_get_devfd(c)),
arg_dry_run ? LOCK_SH : LOCK_EX,
&context->backing_fd);
if (r < 0)
return r;
}