shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-21 05:57:48 +03:00
Code Releases Activity

filesystem: add new_size_bytes to struct fs_info

Browse Source 
It seems we need new_size_bytes in places where struct fs_info is also
passed. Store the new_size_bytes inside the struct fs_info so we
can just pass that one to all the functions we call and hence make
the code a bit cleaner and easier to follow.
This commit is contained in:
Peter Rajnoha 2025-01-03 13:06:27 +01:00
parent 5f53ecda36
commit 036e88eb85
No known key found for this signature in database
GPG Key ID: E776664036DF84AB
3 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/device/filesystem.c
View File

@ -375,8 +375,7 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l
#define FS_CMD_MAX_ARGS 16
int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes_fs)
int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi)
{
char crypt_path[PATH_MAX];
char newsize_str[16] = { 0 };
@ -384,7 +383,7 @@ int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, stru
int args = 0;
int status;
if (dm_snprintf(newsize_str, sizeof(newsize_str), "%llu", (unsigned long long)newsize_bytes_fs) < 0)
if (dm_snprintf(newsize_str, sizeof(newsize_str), "%llu", (unsigned long long)fsi->new_size_bytes) < 0)
return_0;
if (dm_snprintf(crypt_path, sizeof(crypt_path), "/dev/dm-%u", MINOR(fsi->crypt_devt)) < 0)
@ -420,12 +419,11 @@ int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, stru
* if needs_crypt
* cryptsetup resize --size $newsize_sectors $cryptpath
*
* Note: when a crypt layer is included, newsize_bytes_fs is smaller
* Note: when a crypt layer is included, new_size_bytes is smaller
* than newsize_bytes_lv because of the crypt header.
*/
int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes_fs, char *fsmode)
int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi, char *fsmode)
{
char lv_path[PATH_MAX];
char crypt_path[PATH_MAX];
@ -435,7 +433,7 @@ int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct
int args = 0;
int status;
if (dm_snprintf(newsize_str, sizeof(newsize_str), "%llu", (unsigned long long)newsize_bytes_fs) < 0)
if (dm_snprintf(newsize_str, sizeof(newsize_str), "%llu", (unsigned long long)fsi->new_size_bytes) < 0)
return_0;
if (dm_snprintf(lv_path, PATH_MAX, "%s%s/%s", lv->vg->cmd->dev_dir, lv->vg->name, lv->name) < 0)
@ -448,7 +446,7 @@ int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct
argv[++args] = "--lvpath";
argv[++args] = lv_path;
if (newsize_bytes_fs) {
if (fsi->new_size_bytes) {
argv[++args] = "--newsizebytes";
argv[++args] = newsize_str;
}
@ -484,8 +482,8 @@ int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct
devpath = fsi->needs_crypt ? crypt_path : (char *)display_lvname(lv);
log_print_unless_silent("Reducing file system %s to %s (%llu bytes) on %s...",
fsi->fstype, display_size(cmd, newsize_bytes_fs/512),
(unsigned long long)newsize_bytes_fs, devpath);
fsi->fstype, display_size(cmd, fsi->new_size_bytes/512),
(unsigned long long)fsi->new_size_bytes, devpath);
if (!exec_cmd(cmd, argv, &status, 1)) {
log_error("Failed to reduce file system with lvresize_fs_helper.");
@ -513,12 +511,12 @@ int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct
* if $fstype == "xfs"
* xfs_growfs $devpath
*
* Note: when a crypt layer is included, newsize_bytes_fs is smaller
* Note: when a crypt layer is included, new_size_bytes is smaller
* than newsize_bytes_lv because of the crypt header.
*/
int fs_extend_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes_fs, char *fsmode)
char *fsmode)
{
char lv_path[PATH_MAX];
char crypt_path[PATH_MAX];
@ -569,8 +567,8 @@ int fs_extend_script(struct cmd_context *cmd, struct logical_volume *lv, struct
devpath = fsi->needs_crypt ? crypt_path : (char *)display_lvname(lv);
log_print_unless_silent("Extending file system %s to %s (%llu bytes) on %s...",
fsi->fstype, display_size(cmd, newsize_bytes_fs/512),
(unsigned long long)newsize_bytes_fs, devpath);
fsi->fstype, display_size(cmd, fsi->new_size_bytes/512),
(unsigned long long)fsi->new_size_bytes, devpath);
if (!exec_cmd(cmd, argv, &status, 1)) {
log_error("Failed to extend file system with lvresize_fs_helper.");

10
lib/device/filesystem.h
View File

@ -26,6 +26,7 @@ struct fs_info {
uint32_t crypt_offset_bytes; /* offset in bytes of crypt data on LV */
dev_t crypt_devt; /* dm-crypt device between the LV and FS */
uint64_t crypt_dev_size_bytes;
uint64_t new_size_bytes;
unsigned nofs:1;
unsigned unmounted:1;
@ -42,12 +43,9 @@ struct fs_info {
int fs_get_info(struct cmd_context *cmd, struct logical_volume *lv,
struct fs_info *fsi, int include_mount);
int fs_extend_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes, char *fsmode);
int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes, char *fsmode);
int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi,
uint64_t newsize_bytes_fs);
int fs_extend_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi, char *fsmode);
int fs_reduce_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi, char *fsmode);
int crypt_resize_script(struct cmd_context *cmd, struct logical_volume *lv, struct fs_info *fsi);
int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *lv, char *lv_path, char *fstype);
int lv_crypt_is_active(struct cmd_context *cmd, char *lv_path);

54
lib/metadata/lv_manip.c
View File

@ -6046,7 +6046,7 @@ static int _lv_resize_check_used(struct logical_volume *lv)
*/
static int _fs_reduce_allow(struct cmd_context *cmd, struct logical_volume *lv,
struct lvresize_params *lp, uint64_t newsize_bytes_lv,
uint64_t newsize_bytes_fs, struct fs_info *fsi)
struct fs_info *fsi)
{
const char *fs_reduce_cmd = "";
const char *cmp_desc = "";
@ -6062,10 +6062,10 @@ static int _fs_reduce_allow(struct cmd_context *cmd, struct logical_volume *lv,
!strcmp(fsi->fstype, "ext3") ||
!strcmp(fsi->fstype, "ext4") ||
!strcmp(fsi->fstype, "xfs")) {
log_debug("Found fs %s last_byte %llu newsize_bytes_fs %llu",
log_debug("Found fs %s last_byte %llu new_size_bytes %llu",
fsi->fstype,
(unsigned long long)fsi->fs_last_byte,
(unsigned long long)newsize_bytes_fs);
(unsigned long long)fsi->new_size_bytes);
if (!strncmp(fsi->fstype, "ext", 3)) {
is_ext_fstype = 1;
fs_reduce_cmd = " resize2fs";
@ -6090,16 +6090,16 @@ static int _fs_reduce_allow(struct cmd_context *cmd, struct logical_volume *lv,
return 0;
}
if ((equal = (fsi->fs_last_byte == newsize_bytes_fs)))
if ((equal = (fsi->fs_last_byte == fsi->new_size_bytes)))
cmp_desc = "equal to";
else if ((smaller = (fsi->fs_last_byte < newsize_bytes_fs)))
else if ((smaller = (fsi->fs_last_byte < fsi->new_size_bytes)))
cmp_desc = "smaller than";
else if ((larger = (fsi->fs_last_byte > newsize_bytes_fs)))
else if ((larger = (fsi->fs_last_byte > fsi->new_size_bytes)))
cmp_desc = "larger than";
log_print_unless_silent("File system size (%s) is %s the requested size (%s).",
display_size(cmd, fsi->fs_last_byte/512), cmp_desc,
display_size(cmd, newsize_bytes_fs/512));
display_size(cmd, fsi->new_size_bytes/512));
/*
* FS reduce is not needed, it's not using the affected space.
@ -6415,7 +6415,6 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
struct fs_info fsinfo;
struct fs_info fsinfo2;
uint64_t newsize_bytes_lv;
uint64_t newsize_bytes_fs;
int ret = 0;
memset(&fsinfo, 0, sizeof(fsinfo));
@ -6431,7 +6430,7 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
/* extent_size units is SECTOR_SIZE (512) */
newsize_bytes_lv = (uint64_t) lp->extents * lv->vg->extent_size * SECTOR_SIZE;
newsize_bytes_fs = newsize_bytes_lv;
fsinfo.new_size_bytes = newsize_bytes_lv;
/*
* If needs_crypt, then newsize_bytes passed to fs_reduce_script() and
@ -6440,9 +6439,9 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
* 2MB for LUKS1 and 16MB for LUKS2.)
*/
if (fsinfo.needs_crypt) {
newsize_bytes_fs -= fsinfo.crypt_offset_bytes;
fsinfo.new_size_bytes -= fsinfo.crypt_offset_bytes;
log_print_unless_silent("File system size %llub is adjusted for crypt data offset %ub.",
(unsigned long long)newsize_bytes_fs, fsinfo.crypt_offset_bytes);
(unsigned long long)fsinfo.new_size_bytes, fsinfo.crypt_offset_bytes);
}
/*
@ -6451,7 +6450,7 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
* returns 0 and lvreduce should fail. If allowed, returns 1 and sets
* fsinfo.needs_* for any steps that are required to reduce the LV.
*/
if (!_fs_reduce_allow(cmd, lv, lp, newsize_bytes_lv, newsize_bytes_fs, &fsinfo))
if (!_fs_reduce_allow(cmd, lv, lp, newsize_bytes_lv, &fsinfo))
goto_out;
/*
@ -6461,7 +6460,7 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
*/
if (!fsinfo.needs_reduce && fsinfo.needs_crypt) {
/* Check if the crypt device is already sufficiently reduced. */
if (fsinfo.crypt_dev_size_bytes <= newsize_bytes_fs) {
if (fsinfo.crypt_dev_size_bytes <= fsinfo.new_size_bytes) {
log_print_unless_silent("crypt device is already reduced to %llu bytes.",
(unsigned long long)fsinfo.crypt_dev_size_bytes);
ret = 1;
@ -6476,7 +6475,7 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
ret = 1;
goto_out;
}
ret = crypt_resize_script(cmd, lv, &fsinfo, newsize_bytes_fs);
ret = crypt_resize_script(cmd, lv, &fsinfo);
goto out;
}
@ -6510,7 +6509,7 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
*/
unlock_vg(cmd, lv->vg, lv->vg->name);
if (!fs_reduce_script(cmd, lv, &fsinfo, newsize_bytes_fs, lp->fsmode))
if (!fs_reduce_script(cmd, lv, &fsinfo, lp->fsmode))
goto_out;
if (!lock_vol(cmd, lv->vg->name, LCK_VG_WRITE, NULL)) {
@ -6538,10 +6537,10 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
if (!fs_get_info(cmd, lv, &fsinfo2, 0))
goto_out;
if (fsinfo.fs_last_byte && (fsinfo2.fs_last_byte > newsize_bytes_fs)) {
if (fsinfo.fs_last_byte && (fsinfo2.fs_last_byte > fsinfo.new_size_bytes)) {
log_error("File system last byte %llu is greater than new size %llu bytes.",
(unsigned long long)fsinfo2.fs_last_byte,
(unsigned long long)newsize_bytes_fs);
(unsigned long long)fsinfo.new_size_bytes);
goto_out;
}
@ -6550,8 +6549,8 @@ static int _fs_reduce(struct cmd_context *cmd, struct logical_volume *lv,
return ret;
}
static int _fs_extend_check_fsinfo(struct cmd_context *cmd, struct logical_volume *lv, struct lvresize_params *lp,
struct fs_info *fsinfo, uint64_t *newsize_bytes_fs)
static int _fs_extend_check_fsinfo(struct cmd_context *cmd, struct logical_volume *lv,
struct lvresize_params *lp, struct fs_info *fsinfo)
{
uint64_t newsize_bytes_lv;
@ -6564,7 +6563,7 @@ static int _fs_extend_check_fsinfo(struct cmd_context *cmd, struct logical_volum
return 1;
/*
* Note: here in the case of extend, newsize_bytes_lv/newsize_bytes_fs
* Note: here in the case of extend, newsize_bytes_lv/new_size_bytes
* are only calculated and used for log messages. The extend commands
* do not use these values, they just extend to the new LV size that
* is visible to them.
@ -6572,11 +6571,11 @@ static int _fs_extend_check_fsinfo(struct cmd_context *cmd, struct logical_volum
/* extent_size units is SECTOR_SIZE (512) */
newsize_bytes_lv = (uint64_t) lp->extents * lv->vg->extent_size * SECTOR_SIZE;
*newsize_bytes_fs = newsize_bytes_lv;
fsinfo->new_size_bytes = newsize_bytes_lv;
if (fsinfo->needs_crypt) {
*newsize_bytes_fs -= fsinfo->crypt_offset_bytes;
fsinfo->new_size_bytes -= fsinfo->crypt_offset_bytes;
log_print_unless_silent("File system size %llub is adjusted for crypt data offset %ub.",
(unsigned long long)*newsize_bytes_fs, fsinfo->crypt_offset_bytes);
(unsigned long long)fsinfo->new_size_bytes, fsinfo->crypt_offset_bytes);
}
/*
@ -6590,7 +6589,7 @@ static int _fs_extend_check_fsinfo(struct cmd_context *cmd, struct logical_volum
}
static int _fs_extend(struct cmd_context *cmd, struct logical_volume *lv,
struct lvresize_params *lp, struct fs_info *fsinfo, uint64_t newsize_bytes_fs)
struct lvresize_params *lp, struct fs_info *fsinfo)
{
/*
* fs extend is not needed
@ -6619,7 +6618,7 @@ static int _fs_extend(struct cmd_context *cmd, struct logical_volume *lv,
*/
unlock_vg(cmd, lv->vg, lv->vg->name);
return fs_extend_script(cmd, lv, fsinfo, newsize_bytes_fs, lp->fsmode);
return fs_extend_script(cmd, lv, fsinfo, lp->fsmode);
}
int lv_resize(struct cmd_context *cmd, struct logical_volume *lv,
@ -6634,7 +6633,6 @@ int lv_resize(struct cmd_context *cmd, struct logical_volume *lv,
struct logical_volume *lv_main_layer = NULL;
struct logical_volume *lv_meta_layer = NULL;
struct fs_info fsinfo;
uint64_t newsize_bytes_fs;
int main_size_matches = 0;
int meta_size_matches = 0;
int is_extend = (lp->resize == LV_EXTEND);
@ -7097,7 +7095,7 @@ int lv_resize(struct cmd_context *cmd, struct logical_volume *lv,
goto end_main;
if (is_extend && lp->fsopt[0] && strcmp(lp->fsopt, "resize_fsadm")) {
if (!_fs_extend_check_fsinfo(cmd, lv_top, lp, &fsinfo, &newsize_bytes_fs))
if (!_fs_extend_check_fsinfo(cmd, lv_top, lp, &fsinfo))
goto_out;
}
@ -7146,7 +7144,7 @@ int lv_resize(struct cmd_context *cmd, struct logical_volume *lv,
}
} else {
/* New approach to fs handling using fs info. */
if (!_fs_extend(cmd, lv_top, lp, &fsinfo, newsize_bytes_fs)) {
if (!_fs_extend(cmd, lv_top, lp, &fsinfo)) {
log_error("File system extend error.");
lp->extend_fs_error = 1;
goto out;