mirror of
https://github.com/systemd/systemd
synced 2024-09-06 08:46:19 +00:00
Merge pull request #14221 from poettering/homed-preparatory-resizefs
preparatory fs resizing support split out of homed PR
This commit is contained in:
commit
68296b8b83
|
@ -32,3 +32,8 @@
|
|||
#ifndef MQUEUE_MAGIC
|
||||
#define MQUEUE_MAGIC 0x19800202
|
||||
#endif
|
||||
|
||||
/* Not exposed yet (as of Linux 5.4). Defined in fs/xfs/libxfs/xfs_format.h */
|
||||
#ifndef XFS_SB_MAGIC
|
||||
#define XFS_SB_MAGIC 0x58465342
|
||||
#endif
|
||||
|
|
42
src/basic/missing_xfs.h
Normal file
42
src/basic/missing_xfs.h
Normal file
|
@ -0,0 +1,42 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
#pragma once
|
||||
|
||||
/* This is currently not exported in the public kernel headers, but the libxfs library code part of xfsprogs
|
||||
* defines it as public header */
|
||||
|
||||
#ifndef XFS_IOC_FSGEOMETRY
|
||||
#define XFS_IOC_FSGEOMETRY _IOR ('X', 124, struct xfs_fsop_geom)
|
||||
|
||||
typedef struct xfs_fsop_geom {
|
||||
uint32_t blocksize;
|
||||
uint32_t rtextsize;
|
||||
uint32_t agblocks;
|
||||
uint32_t agcount;
|
||||
uint32_t logblocks;
|
||||
uint32_t sectsize;
|
||||
uint32_t inodesize;
|
||||
uint32_t imaxpct;
|
||||
uint64_t datablocks;
|
||||
uint64_t rtblocks;
|
||||
uint64_t rtextents;
|
||||
uint64_t logstart;
|
||||
unsigned char uuid[16];
|
||||
uint32_t sunit;
|
||||
uint32_t swidth;
|
||||
int32_t version;
|
||||
uint32_t flags;
|
||||
uint32_t logsectsize;
|
||||
uint32_t rtsectsize;
|
||||
uint32_t dirblocksize;
|
||||
uint32_t logsunit;
|
||||
} xfs_fsop_geom_t;
|
||||
#endif
|
||||
|
||||
#ifndef XFS_IOC_FSGROWFSDATA
|
||||
#define XFS_IOC_FSGROWFSDATA _IOW ('X', 110, struct xfs_growfs_data)
|
||||
|
||||
typedef struct xfs_growfs_data {
|
||||
uint64_t newblocks;
|
||||
uint32_t imaxpct;
|
||||
} xfs_growfs_data_t;
|
||||
#endif
|
|
@ -147,6 +147,8 @@ shared_sources = files('''
|
|||
ptyfwd.h
|
||||
reboot-util.c
|
||||
reboot-util.h
|
||||
resize-fs.c
|
||||
resize-fs.h
|
||||
resolve-util.c
|
||||
resolve-util.h
|
||||
seccomp-util.h
|
||||
|
|
112
src/shared/resize-fs.c
Normal file
112
src/shared/resize-fs.c
Normal file
|
@ -0,0 +1,112 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
|
||||
#include <linux/btrfs.h>
|
||||
#include <linux/magic.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/vfs.h>
|
||||
|
||||
#include "blockdev-util.h"
|
||||
#include "fs-util.h"
|
||||
#include "missing_fs.h"
|
||||
#include "missing_magic.h"
|
||||
#include "missing_xfs.h"
|
||||
#include "resize-fs.h"
|
||||
#include "stat-util.h"
|
||||
|
||||
int resize_fs(int fd, uint64_t sz) {
|
||||
struct statfs sfs;
|
||||
int r;
|
||||
|
||||
assert(fd >= 0);
|
||||
|
||||
/* Rounds down to next block size */
|
||||
|
||||
if (sz <= 0 || sz == UINT64_MAX)
|
||||
return -ERANGE;
|
||||
|
||||
if (fstatfs(fd, &sfs) < 0)
|
||||
return -errno;
|
||||
|
||||
if (is_fs_type(&sfs, EXT4_SUPER_MAGIC)) {
|
||||
uint64_t u;
|
||||
|
||||
if (sz < EXT4_MINIMAL_SIZE)
|
||||
return -ERANGE;
|
||||
|
||||
u = sz / sfs.f_bsize;
|
||||
|
||||
if (ioctl(fd, EXT4_IOC_RESIZE_FS, &u) < 0)
|
||||
return -errno;
|
||||
|
||||
} else if (is_fs_type(&sfs, BTRFS_SUPER_MAGIC)) {
|
||||
struct btrfs_ioctl_vol_args args = {};
|
||||
|
||||
/* 256M is the minimize size enforced by the btrfs kernel code when resizing (which is
|
||||
* strange btw, as mkfs.btrfs is fine creating file systems > 109M). It will return EINVAL in
|
||||
* that case, let's catch this error beforehand though, and report a more explanatory
|
||||
* error. */
|
||||
|
||||
if (sz < BTRFS_MINIMAL_SIZE)
|
||||
return -ERANGE;
|
||||
|
||||
r = snprintf(args.name, sizeof(args.name), "%" PRIu64, sz);
|
||||
assert((size_t) r < sizeof(args.name));
|
||||
|
||||
if (ioctl(fd, BTRFS_IOC_RESIZE, &args) < 0)
|
||||
return -errno;
|
||||
|
||||
} else if (is_fs_type(&sfs, XFS_SB_MAGIC)) {
|
||||
xfs_fsop_geom_t geo;
|
||||
xfs_growfs_data_t d;
|
||||
|
||||
if (sz < XFS_MINIMAL_SIZE)
|
||||
return -ERANGE;
|
||||
|
||||
if (ioctl(fd, XFS_IOC_FSGEOMETRY, &geo) < 0)
|
||||
return -errno;
|
||||
|
||||
d = (xfs_growfs_data_t) {
|
||||
.imaxpct = geo.imaxpct,
|
||||
.newblocks = sz / geo.blocksize,
|
||||
};
|
||||
|
||||
if (ioctl(fd, XFS_IOC_FSGROWFSDATA, &d) < 0)
|
||||
return -errno;
|
||||
|
||||
} else
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64_t minimal_size_by_fs_magic(statfs_f_type_t magic) {
|
||||
|
||||
switch (magic) {
|
||||
|
||||
case (statfs_f_type_t) EXT4_SUPER_MAGIC:
|
||||
return EXT4_MINIMAL_SIZE;
|
||||
|
||||
case (statfs_f_type_t) XFS_SB_MAGIC:
|
||||
return XFS_MINIMAL_SIZE;
|
||||
|
||||
case (statfs_f_type_t) BTRFS_SUPER_MAGIC:
|
||||
return BTRFS_MINIMAL_SIZE;
|
||||
|
||||
default:
|
||||
return UINT64_MAX;
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t minimal_size_by_fs_name(const char *name) {
|
||||
|
||||
if (streq_ptr(name, "ext4"))
|
||||
return EXT4_MINIMAL_SIZE;
|
||||
|
||||
if (streq_ptr(name, "xfs"))
|
||||
return XFS_MINIMAL_SIZE;
|
||||
|
||||
if (streq_ptr(name, "btrfs"))
|
||||
return BTRFS_MINIMAL_SIZE;
|
||||
|
||||
return UINT64_MAX;
|
||||
}
|
15
src/shared/resize-fs.h
Normal file
15
src/shared/resize-fs.h
Normal file
|
@ -0,0 +1,15 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1+ */
|
||||
#pragma once
|
||||
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "stat-util.h"
|
||||
|
||||
int resize_fs(int fd, uint64_t sz);
|
||||
|
||||
#define BTRFS_MINIMAL_SIZE (256U*1024U*1024U)
|
||||
#define XFS_MINIMAL_SIZE (14U*1024U*1024U)
|
||||
#define EXT4_MINIMAL_SIZE (1024U*1024U)
|
||||
|
||||
uint64_t minimal_size_by_fs_magic(statfs_f_type_t magic);
|
||||
uint64_t minimal_size_by_fs_name(const char *str);
|
Loading…
Reference in a new issue