Daan De Meyer
74d392ed1b
Drop the -fundamental suffix from src/fundamental/ headers in favor of names
that match their src/basic/ or src/shared/ counterparts (e.g.
macro-fundamental.h -> macro.h, assert-fundamental.h -> assert-util.h,
cleanup-fundamental.h -> cleanup-util.h). Rename src/basic/{btrfs,label}.{c,h}
to use the -util suffix to match the existing shared/btrfs-util and
shared/label-util siblings. Rename src/shared/mkdir-label.{c,h} to mkdir.{c,h}
and src/shared/tmpfile-util-label.{c,h} to tmpfile-util.{c,h} to match the
corresponding src/basic names.
This saves us from having to come up with separate names for files that do
the same thing across tiers, and it makes it easier to move stuff between
src/fundamental, src/basic and src/shared: consumers just #include "foo.h"
and pick up whichever tier their -I path resolves to first, so call sites
don't need to be updated when an API moves between layers.
Where a higher-tier wrapper exists (e.g. src/basic/macro.h wrapping
src/fundamental/macro.h), the wrapper uses an explicit "../fundamental/foo.h"
or "../basic/foo.h" relative include for the lower-tier header. We can't use
GCC's #include_next directive for this — when the wrapper is reachable both
via same-dir-as-source lookup and via -I (e.g. -Isrc/shared) for the
directory it lives in, #include_next advances by exactly one slot in libcpp's
internal directory chain and lands on the same physical directory it was
already in, never reaching the lower-tier sibling (see make_cpp_dir() in
gcc/libcpp/files.cc:1986).
To make sure the right headers are always picked up, the include directories
are reordered so that e.g. src/shared always takes priority over src/basic and
similar for the other directories.
Co-developed-by: Claude Opus 4.7 <noreply@anthropic.com>
95 lines
2.4 KiB
C
95 lines
2.4 KiB
C
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
|
|
#include <linux/btrfs.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "alloc-util.h"
|
|
#include "btrfs-util.h"
|
|
#include "errno-util.h"
|
|
#include "fd-util.h"
|
|
#include "fs-util.h"
|
|
#include "path-util.h"
|
|
#include "string-util.h"
|
|
|
|
int btrfs_validate_subvolume_name(const char *name) {
|
|
|
|
if (!filename_is_valid(name))
|
|
return -EINVAL;
|
|
|
|
if (strlen(name) > BTRFS_SUBVOL_NAME_MAX)
|
|
return -E2BIG;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int extract_subvolume_name(const char *path, char **ret) {
|
|
_cleanup_free_ char *fn = NULL;
|
|
int r;
|
|
|
|
assert(path);
|
|
assert(ret);
|
|
|
|
r = path_extract_filename(path, &fn);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
r = btrfs_validate_subvolume_name(fn);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
*ret = TAKE_PTR(fn);
|
|
return 0;
|
|
}
|
|
|
|
int btrfs_subvol_make(int dir_fd, const char *path) {
|
|
struct btrfs_ioctl_vol_args args = {};
|
|
_cleanup_free_ char *subvolume = NULL, *parent = NULL;
|
|
_cleanup_close_ int fd = -EBADF;
|
|
int r;
|
|
|
|
assert(dir_fd >= 0 || IN_SET(dir_fd, AT_FDCWD, XAT_FDROOT));
|
|
assert(!isempty(path));
|
|
|
|
r = extract_subvolume_name(path, &subvolume);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
r = path_extract_directory(path, &parent);
|
|
if (r < 0 && r != -EDESTADDRREQ) /* Propagate error, unless only a filename was specified, which is OK */
|
|
return r;
|
|
|
|
fd = xopenat(dir_fd, parent ?: ".", O_DIRECTORY|O_RDONLY|O_CLOEXEC);
|
|
if (fd < 0)
|
|
return fd;
|
|
|
|
strncpy(args.name, subvolume, sizeof(args.name)-1);
|
|
|
|
return RET_NERRNO(ioctl(fd, BTRFS_IOC_SUBVOL_CREATE, &args));
|
|
}
|
|
|
|
int btrfs_subvol_make_fallback(int dir_fd, const char *path, mode_t mode) {
|
|
mode_t old, combined;
|
|
int r;
|
|
|
|
assert(path);
|
|
|
|
/* Let's work like mkdir(), i.e. take the specified mode, and mask it with the current umask. */
|
|
old = umask(~mode);
|
|
combined = old | ~mode;
|
|
if (combined != ~mode)
|
|
umask(combined);
|
|
r = btrfs_subvol_make(dir_fd, path);
|
|
umask(old);
|
|
|
|
if (r >= 0)
|
|
return 1; /* subvol worked */
|
|
if (!ERRNO_IS_NOT_SUPPORTED(r))
|
|
return r;
|
|
|
|
if (mkdirat(dir_fd, path, mode) < 0)
|
|
return -errno;
|
|
|
|
return 0; /* plain directory */
|
|
}
|