From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 05/13] installer: Make btrfs functions static Date: Fri, 05 Apr 2024 12:59:34 +0000 Message-ID: <20240405125942.1803058-5-michael.tremer@ipfire.org> In-Reply-To: <20240405125942.1803058-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7819647410065228067==" List-Id: --===============7819647410065228067== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- src/installer/hw.c | 284 ++++++++++++++++++++------------------------- 1 file changed, 129 insertions(+), 155 deletions(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 72d736bb1..f4a84804d 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -811,6 +811,65 @@ int hw_create_partitions(struct hw_destination* dest, co= nst char* output) { return r; } =20 +static int hw_create_btrfs_subvolume(const char* output, const char* subvolu= me) { + char command [STRING_SIZE]; + int r; + + // Abort if the command could not be assigned. + r =3D snprintf(command, sizeof(command), "/usr/bin/btrfs subvolume create = %s/%s", DESTINATION_MOUNT_PATH, subvolume); + if (r < 0) + return r; + + // Create the subvolume + r =3D mysystem(output, command); + if (r) + return r; + + return 0; +} + +static int hw_create_btrfs_layout(const char* path, const char* output) { + const struct btrfs_subvolumes* subvolume =3D NULL; + char cmd[STRING_SIZE]; + char volume[STRING_SIZE]; + int r; + + r =3D snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -f %s", path); + if (r < 0) + return r; + + // Create the main BTRFS file system. + r =3D mysystem(output, cmd); + if (r) + return r; + + // We need to mount the FS in order to create any subvolumes. + r =3D hw_mount(path, DESTINATION_MOUNT_PATH, "btrfs", 0); + if (r) + return r; + + // Loop through the list of subvolumes to create. + for ( subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++ ) { + r =3D snprintf(volume, sizeof(volume), "%s", subvolume->name); + + // Abort if snprintf fails. + if (r < 0) + return r; + + // Call function to create the subvolume + r =3D hw_create_btrfs_subvolume(output, volume); + if (r) + return r; + } + + // Umount the main BTRFS after subvolume creation. + r =3D hw_umount(DESTINATION_MOUNT_PATH, 0); + if (r) + return r; + + return 0; +} + static int hw_format_filesystem(const char* path, int fs, const char* output= ) { char cmd[STRING_SIZE] =3D "\0"; int r; @@ -881,54 +940,38 @@ int hw_create_filesystems(struct hw_destination* dest, = const char* output) { return 0; } =20 -int hw_create_btrfs_layout(const char* path, const char* output) { +static int hw_mount_btrfs_subvolumes(const char* source) { const struct btrfs_subvolumes* subvolume =3D NULL; - char cmd[STRING_SIZE]; - char volume[STRING_SIZE]; + char path[STRING_SIZE]; + char options[STRING_SIZE]; int r; =20 - r =3D snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -f %s", path); - if (r < 0) { - return r; - } - - // Create the main BTRFS file system. - r =3D mysystem(output, cmd); - - if (r) { - return r; - } - - - // We need to mount the FS in order to create any subvolumes. - r =3D hw_mount(path, DESTINATION_MOUNT_PATH, "btrfs", 0); - - if (r) { - return r; - } - - // Loop through the list of subvolumes to create. - for ( subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++ ) { - r =3D snprintf(volume, sizeof(volume), "%s", subvolume->name); + // Loop through the list of known subvolumes. + for (subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++) { + // Assign subvolume path. + r =3D snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, subvolu= me->mount_path); + if (r < 0) + return r; =20 - // Abort if snprintf fails. - if (r < 0) { + // Assign subvolume name. + r =3D snprintf(options, sizeof(options), "subvol=3D%s,%s", subvolume->name= , BTRFS_MOUNT_OPTIONS); + if (r < 0) return r; - } =20 - // Call function to create the subvolume - r =3D hw_create_btrfs_subvolume(output, volume); + // Create the directory. + r =3D hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO); =20 - if (r) { + // Abort if the directory could not be created. + if(r !=3D 0 && errno !=3D EEXIST) return r; - } - } =20 - // Umount the main BTRFS after subvolume creation. - r =3D hw_umount(DESTINATION_MOUNT_PATH, 0); + // Print log message + fprintf(flog, "Mounting subvolume %s to %s\n", subvolume->name, subvolume-= >mount_path); =20 - if (r) { - return r; + // Try to mount the subvolume. + r =3D mount(source, path, "btrfs", NULL, options); + if (r) + return r; } =20 return 0; @@ -966,12 +1009,10 @@ int hw_mount_filesystems(struct hw_destination* dest, = const char* prefix) { // root if (dest->filesystem =3D=3D HW_FS_BTRFS) { r =3D hw_mount_btrfs_subvolumes(dest->part_root); - if (r) return r; } else { r =3D hw_mount(dest->part_root, prefix, filesystem, 0); - if (r) return r; } @@ -1038,46 +1079,65 @@ int hw_mount_filesystems(struct hw_destination* dest,= const char* prefix) { return 0; } =20 -int hw_mount_btrfs_subvolumes(const char* source) { +static int hw_umount_btrfs_layout() { const struct btrfs_subvolumes* subvolume =3D NULL; char path[STRING_SIZE]; - char options[STRING_SIZE]; + int counter =3D 0; + int retry =3D 1; int r; =20 - // Loop through the list of known subvolumes. - for ( subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++ ) { - // Assign subvolume path. - r =3D snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, subvolu= me->mount_path); - - if (r < 0) { - return r; - } + do { + // Reset the retry marker + retry =3D 0; =20 - // Assign subvolume name. - r =3D snprintf(options, sizeof(options), "subvol=3D%s,%s", subvolume->name= , BTRFS_MOUNT_OPTIONS); - if (r < 0) { - return r; - } + // Loop through the list of subvolumes + for (subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++) { + // Abort if the subvolume path could not be assigned. + r =3D snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, subvol= ume->mount_path); + if (r < 0) + return r; =20 - // Create the directory. - r =3D hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO); + // Try to umount the subvolume. + r =3D umount2(path, 0); =20 - // Abort if the directory could not be created. - if(r !=3D 0 && errno !=3D EEXIST) - return r; + // Handle return codes. + if (r) { + switch(errno) { + case EBUSY: + // Set marker to retry the umount. + retry =3D 1; =20 - // Print log message - fprintf(flog, "Mounting subvolume %s to %s\n", subvolume->name, subvolume-= >mount_path); + // Ignore if the subvolume could not be unmounted yet, + // because it is still used. + continue; =20 - // Try to mount the subvolume. - r =3D mount(source, path, "btrfs", NULL, options); + case EINVAL: + // Ignore if the subvolume already has been unmounted + continue; + case ENOENT: + // Ignore if the directory does not longer exist. + continue; + default: + fprintf(flog, "Could not umount %s from %s - Error: %d\n", subvolume->= name, path, r); + return r; + } + } =20 - if (r) { - return r; + // Print log message + fprintf(flog, "Umounted %s from %s\n", subvolume->name, path); } - } -=09 - return 0; + + // Abort loop if all mountpoins got umounted + if (retry =3D=3D 0) + return 0; + + // Abort after five failed umount attempts + if (counter =3D=3D 5) + return -1; + + // Increment counter. + counter++; + } while (1); } =20 int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { @@ -1136,71 +1196,6 @@ int hw_umount_filesystems(struct hw_destination* dest,= const char* prefix) { return 0; } =20 -int hw_umount_btrfs_layout() { - const struct btrfs_subvolumes* subvolume =3D NULL; - char path[STRING_SIZE]; - int counter =3D 0; - int retry =3D 1; - int r; - - do { - // Reset the retry marker - retry =3D 0; - - // Loop through the list of subvolumes - for (subvolume =3D btrfs_subvolumes; subvolume->name; subvolume++) { - // Abort if the subvolume path could not be assigned. - r =3D snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, subvol= ume->mount_path); - - if (r < 0) { - return r; - } - - // Try to umount the subvolume. - r =3D umount2(path, 0); - - // Handle return codes. - if (r) { - switch(errno) { - case EBUSY: - // Set marker to retry the umount. - retry =3D 1; - - // Ignore if the subvolume could not be unmounted yet, - // because it is still used. - continue; - - case EINVAL: - // Ignore if the subvolume already has been unmounted - continue; - case ENOENT: - // Ignore if the directory does not longer exist. - continue; - default: - fprintf(flog, "Could not umount %s from %s - Error: %d\n", subvolume->= name, path, r); - return r; - } - } - - // Print log message - fprintf(flog, "Umounted %s from %s\n", subvolume->name, path); - } - - // Abort loop if all mountpoins got umounted - if (retry =3D=3D 0) { - return 0; - } - - // Abort after five failed umount attempts - if (counter =3D=3D 5) { - return -1; - } - - // Increment counter. - counter++; - } while (1); -} - int hw_destroy_raid_superblocks(const struct hw_destination* dest, const cha= r* output) { char cmd[STRING_SIZE]; =20 @@ -1463,24 +1458,3 @@ int hw_mkdir(const char *dir) { =20 return 0; } - - -int hw_create_btrfs_subvolume(const char* output, const char* subvolume) { - char command [STRING_SIZE]; - int r; - - // Abort if the command could not be assigned. - r =3D snprintf(command, sizeof(command), "/usr/bin/btrfs subvolume create = %s/%s", DESTINATION_MOUNT_PATH, subvolume); - if (r < 0) { - return r; - } - - // Create the subvolume - r =3D mysystem(output, command); - - if (r) { - return r; - } - - return 0; -} --=20 2.39.2 --===============7819647410065228067==--