RFC: btrfs plugin: use libbtrfsutil #999
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,11 +22,14 @@ | |
| #include <unistd.h> | ||
| #include <blockdev/utils.h> | ||
| #include <bs_size.h> | ||
| #include <btrfsutil.h> | ||
|
|
||
| #include "btrfs.h" | ||
| #include "check_deps.h" | ||
|
|
||
| #define BTRFS_MIN_VERSION "3.18.2" | ||
| // HACK: btrfsutil issue? | ||
| #define BTRFS_FSID_SIZE 16 | ||
|
|
||
| /** | ||
| * SECTION: btrfs | ||
|
|
@@ -211,23 +214,6 @@ static BDBtrfsDeviceInfo* get_device_info_from_match (GMatchInfo *match_info) { | |
| return ret; | ||
| } | ||
|
|
||
| static BDBtrfsFilesystemInfo* get_filesystem_info_from_match (GMatchInfo *match_info) { | ||
| BDBtrfsFilesystemInfo *ret = g_new(BDBtrfsFilesystemInfo, 1); | ||
| gchar *item = NULL; | ||
|
|
@@ -388,22 +374,24 @@ gboolean bd_btrfs_remove_device (const gchar *mountpoint, const gchar *device, c | |
| * | ||
| * Tech category: %BD_BTRFS_TECH_SUBVOL-%BD_BTRFS_TECH_MODE_CREATE | ||
| */ | ||
| gboolean bd_btrfs_create_subvolume (const gchar *mountpoint, const gchar *name, G_GNUC_UNUSED const BDExtraArg **extra, GError **error) { | ||
| gchar *path = NULL; | ||
| gboolean success = FALSE; | ||
| enum btrfs_util_error err; | ||
|
|
||
| if (g_str_has_suffix (mountpoint, "/")) | ||
| path = g_strdup_printf ("%s%s", mountpoint, name); | ||
| else | ||
| path = g_strdup_printf ("%s/%s", mountpoint, name); | ||
|
|
||
|
|
||
| err = btrfs_util_create_subvolume (path, 0 ,NULL ,NULL); | ||
| if (err) { | ||
| g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_DEVICE, "%s: %m", btrfs_util_strerror (err)); | ||
| } else { | ||
| success = TRUE; | ||
| } | ||
|
|
||
| g_free (path); | ||
|
|
||
| return success; | ||
|
|
@@ -421,22 +409,24 @@ gboolean bd_btrfs_create_subvolume (const gchar *mountpoint, const gchar *name, | |
| * | ||
| * Tech category: %BD_BTRFS_TECH_SUBVOL-%BD_BTRFS_TECH_MODE_DELETE | ||
| */ | ||
| gboolean bd_btrfs_delete_subvolume (const gchar *mountpoint, const gchar *name, G_GNUC_UNUSED const BDExtraArg **extra, GError **error) { | ||
| gchar *path = NULL; | ||
| gboolean success = FALSE; | ||
| enum btrfs_util_error err; | ||
|
|
||
| if (g_str_has_suffix (mountpoint, "/")) | ||
| path = g_strdup_printf ("%s%s", mountpoint, name); | ||
| else | ||
| path = g_strdup_printf ("%s/%s", mountpoint, name); | ||
|
|
||
| // TODO: support BTRFS_UTIL_DELETE_SUBVOLUME_RECURSIVE | ||
| err = btrfs_util_delete_subvolume (path, 0); | ||
| if (err) { | ||
| g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_DEVICE, "%s: %m", btrfs_util_strerror (err)); | ||
| } else { | ||
| success = TRUE; | ||
| } | ||
|
|
||
| g_free (path); | ||
|
|
||
| return success; | ||
|
|
@@ -453,48 +443,14 @@ gboolean bd_btrfs_delete_subvolume (const gchar *mountpoint, const gchar *name, | |
| * Tech category: %BD_BTRFS_TECH_SUBVOL-%BD_BTRFS_TECH_MODE_QUERY | ||
| */ | ||
| guint64 bd_btrfs_get_default_subvolume_id (const gchar *mountpoint, GError **error) { | ||
| enum btrfs_util_error err; | ||
| guint64 ret = 0; | ||
|
|
||
| err = btrfs_util_get_default_subvolume (mountpoint, &ret); | ||
| if (err) { | ||
| g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_NOT_FOUND, "%s: %m", btrfs_util_strerror (err)); | ||
| } | ||
|
|
||
| return ret; | ||
| } | ||
|
|
||
|
|
@@ -511,17 +467,15 @@ guint64 bd_btrfs_get_default_subvolume_id (const gchar *mountpoint, GError **err | |
| * | ||
| * Tech category: %BD_BTRFS_TECH_SUBVOL-%BD_BTRFS_TECH_MODE_MODIFY | ||
| */ | ||
|
There was a problem hiding this comment. This breaks udisks, which I think we rather not? But -Werror will scream at me if I keep it around. I guess I should mark it with something __unused? There was a problem hiding this comment. Yes, existing public API cannot be changed. Please add If you want to keep full API compatibility, you'd need to translate any known extra args to library calls/arguments. Porting existing API is tough, creating new API from scratch is much easier. There was a problem hiding this comment. I think deprecating the argument would be the best, I am not sure what extra options can be given as So I think for backwards compatibility this would actually work out quite well in this instance. Should I add There was a problem hiding this comment. No need to special annotation for function arguments I guess. |
||
| gboolean bd_btrfs_set_default_subvolume (const gchar *mountpoint, guint64 subvol_id, G_GNUC_UNUSED const BDExtraArg **extra, GError **error) { | ||
| enum btrfs_util_error err; | ||
| gboolean ret = FALSE; | ||
|
|
||
| err = btrfs_util_set_default_subvolume (mountpoint, subvol_id); | ||
| if (err) | ||
| g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_NOT_FOUND, "%s: %m", btrfs_util_strerror (err)); | ||
| else | ||
| ret = TRUE; | ||
|
|
||
| return ret; | ||
| } | ||
|
|
@@ -643,112 +597,52 @@ BDBtrfsDeviceInfo** bd_btrfs_list_devices (const gchar *device, GError **error) | |
| * Tech category: %BD_BTRFS_TECH_SUBVOL-%BD_BTRFS_TECH_MODE_QUERY | ||
| */ | ||
| BDBtrfsSubvolumeInfo** bd_btrfs_list_subvolumes (const gchar *mountpoint, gboolean snapshots_only, GError **error) { | ||
| struct btrfs_util_subvolume_iterator *iter; | ||
| enum btrfs_util_error err; | ||
| char *path; | ||
| char empty_uuid[BTRFS_FSID_SIZE] = {0}; | ||
| struct btrfs_util_subvolume_info info; | ||
| BDBtrfsSubvolumeInfo** ret = NULL; | ||
| GPtrArray *subvol_infos; | ||
|
|
||
| err = btrfs_util_create_subvolume_iterator (mountpoint, 5, 0, &iter); | ||
| if (err) { | ||
| g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_NOT_FOUND, "%s: %m", btrfs_util_strerror (err)); | ||
| return NULL; | ||
| } | ||
|
|
||
| subvol_infos = g_ptr_array_new (); | ||
| while (!(err = btrfs_util_subvolume_iterator_next_info (iter, &path, &info))) { | ||
| /* See uapi/linux/btrfs.h */ | ||
| if (snapshots_only && memcmp (info.parent_uuid, empty_uuid, BTRFS_FSID_SIZE) == 0) | ||
| continue; | ||
|
|
||
| BDBtrfsSubvolumeInfo *subvol = g_new (BDBtrfsSubvolumeInfo, 1); | ||
| subvol->id = info.id; | ||
| subvol->parent_id = info.parent_id; | ||
| subvol->path = g_strdup (path); | ||
| g_ptr_array_add (subvol_infos, subvol); | ||
|
|
||
| free (path); | ||
| } | ||
|
|
||
| btrfs_util_destroy_subvolume_iterator (iter); | ||
|
|
||
| // TODO: this can be Stop iteration: Success (3) | ||
| // if (err) { | ||
| // g_set_error (error, BD_BTRFS_ERROR, BD_BTRFS_ERROR_NOT_FOUND, "%s: %m", btrfs_util_strerror (err)); | ||
| // return NULL; | ||
| // } | ||
|
|
||
| /* now we know how much space to allocate for the result (subvols + NULL) */ | ||
| ret = g_new0 (BDBtrfsSubvolumeInfo*, subvol_infos->len + 1); | ||
|
|
||
| guint64 i = 0; | ||
| BDBtrfsSubvolumeInfo* item = NULL; | ||
| for (i=0; i < subvol_infos->len; i++) { | ||
| item = (BDBtrfsSubvolumeInfo*) g_ptr_array_index (subvol_infos, i); | ||
| ret[i] = item; | ||
| } | ||
|
|
||
| /* now just free the pointer array */ | ||
| g_ptr_array_free (subvol_infos, TRUE); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a bit arbitrary, needs some investigation which version is really needed, then again 5.1 is from 2019.