SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26726 from DaanDeMeyer/cleanups

Browse Source 
Various small cleanups
This commit is contained in:
Daan De Meyer
2023-03-10 14:22:53 +01:00
committed by GitHub
parent d0ed83f3ae 37c485482f
commit aa41079175
13 changed files with 124 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/data-fd-util.c
+6 -17
View File
@@ -30,7 +30,6 @@ int acquire_data_fd(const void *data, size_t size, unsigned flags) {
_cleanup_close_ int fd = -EBADF;
int isz = 0, r;
ssize_t n;
off_t f;
assert(data || size == 0);
@@ -58,23 +57,13 @@ int acquire_data_fd(const void *data, size_t size, unsigned flags) {
return RET_NERRNO(open("/dev/null", O_RDONLY|O_CLOEXEC|O_NOCTTY));
if ((flags & ACQUIRE_NO_MEMFD) == 0) {
fd = memfd_new("data-fd");
if (fd < 0)
goto try_pipe;
fd = memfd_new_and_seal("data-fd", data, size);
if (fd < 0) {
if (ERRNO_IS_NOT_SUPPORTED(fd))
goto try_pipe;
n = write(fd, data, size);
if (n < 0)
return -errno;
if ((size_t) n != size)
return -EIO;
f = lseek(fd, 0, SEEK_SET);
if (f != 0)
return -errno;
r = memfd_set_sealed(fd);
if (r < 0)
return r;
return fd;
}
return TAKE_FD(fd);
}
src/shared/discover-image.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "hashmap.h"
#include "hostname-setup.h"
#include "id128-util.h"
#include "lockfile-util.h"
#include "lock-util.h"
#include "log.h"
#include "loop-util.h"
#include "macro.h"
src/shared/discover-image.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "sd-id128.h"
#include "hashmap.h"
#include "lockfile-util.h"
#include "lock-util.h"
#include "macro.h"
#include "path-util.h"
#include "string-util.h"
src/shared/lockfile-util.c
-136
View File
@@ -1,136 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <sys/file.h>
#include <sys/stat.h>
#include "alloc-util.h"
#include "fd-util.h"
#include "fs-util.h"
#include "lockfile-util.h"
#include "macro.h"
#include "missing_fcntl.h"
#include "path-util.h"
int make_lock_file(const char *p, int operation, LockFile *ret) {
_cleanup_close_ int fd = -EBADF;
_cleanup_free_ char *t = NULL;
int r;
assert(p);
assert(ret);
/*
* We use UNPOSIX locks if they are available. They have nice semantics, and are mostly compatible
* with NFS. However, they are only available on new kernels. When we detect we are running on an
* older kernel, then we fall back to good old BSD locks. They also have nice semantics, but are
* slightly problematic on NFS, where they are upgraded to POSIX locks, even though locally they are
* orthogonal to POSIX locks.
*/
t = strdup(p);
if (!t)
return -ENOMEM;
for (;;) {
struct flock fl = {
.l_type = (operation & ~LOCK_NB) == LOCK_EX ? F_WRLCK : F_RDLCK,
.l_whence = SEEK_SET,
};
struct stat st;
fd = open(p, O_CREAT|O_RDWR|O_NOFOLLOW|O_CLOEXEC|O_NOCTTY, 0600);
if (fd < 0)
return -errno;
r = fcntl(fd, (operation & LOCK_NB) ? F_OFD_SETLK : F_OFD_SETLKW, &fl);
if (r < 0) {
/* If the kernel is too old, use good old BSD locks */
if (errno == EINVAL || ERRNO_IS_NOT_SUPPORTED(errno))
r = flock(fd, operation);
if (r < 0)
return errno == EAGAIN ? -EBUSY : -errno;
}
/* If we acquired the lock, let's check if the file still exists in the file system. If not,
* then the previous exclusive owner removed it and then closed it. In such a case our
* acquired lock is worthless, hence try again. */
if (fstat(fd, &st) < 0)
return -errno;
if (st.st_nlink > 0)
break;
fd = safe_close(fd);
}
*ret = (LockFile) {
.path = TAKE_PTR(t),
.fd = TAKE_FD(fd),
.operation = operation,
};
return r;
}
int make_lock_file_for(const char *p, int operation, LockFile *ret) {
_cleanup_free_ char *fn = NULL, *dn = NULL, *t = NULL;
int r;
assert(p);
assert(ret);
r = path_extract_filename(p, &fn);
if (r < 0)
return r;
r = path_extract_directory(p, &dn);
if (r < 0)
return r;
t = strjoin(dn, "/.#", fn, ".lck");
if (!t)
return -ENOMEM;
return make_lock_file(t, operation, ret);
}
void release_lock_file(LockFile *f) {
int r;
if (!f)
return;
if (f->path) {
/* If we are the exclusive owner we can safely delete
* the lock file itself. If we are not the exclusive
* owner, we can try becoming it. */
if (f->fd >= 0 &&
(f->operation & ~LOCK_NB) == LOCK_SH) {
static const struct flock fl = {
.l_type = F_WRLCK,
.l_whence = SEEK_SET,
};
r = fcntl(f->fd, F_OFD_SETLK, &fl);
if (r < 0 && (errno == EINVAL || ERRNO_IS_NOT_SUPPORTED(errno)))
r = flock(f->fd, LOCK_EX|LOCK_NB);
if (r >= 0)
f->operation = LOCK_EX|LOCK_NB;
}
if ((f->operation & ~LOCK_NB) == LOCK_EX)
unlink_noerrno(f->path);
f->path = mfree(f->path);
}
f->fd = safe_close(f->fd);
f->operation = 0;
}
src/shared/lockfile-util.h
-14
View File
@@ -1,14 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
typedef struct LockFile {
char *path;
int fd;
int operation;
} LockFile;
int make_lock_file(const char *p, int operation, LockFile *ret);
int make_lock_file_for(const char *p, int operation, LockFile *ret);
void release_lock_file(LockFile *f);
#define LOCK_FILE_INIT { .fd = -EBADF, .path = NULL }
src/shared/meson.build
-1
View File
@@ -98,7 +98,6 @@ shared_sources = files(
'libmount-util.c',
'local-addresses.c',
'locale-setup.c',
'lockfile-util.c',
'logs-show.c',
'loop-util.c',
'loopback-setup.c',