Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: btrfs multidisk volume support #838

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

WIP: btrfs multidisk volume support #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3800198
tests: Re-enable btrfs device number checks
tbzatek Jan 11, 2021
ff998c5
udisksmountmonitor: Store filesystem UUID for the mount
tbzatek Jan 12, 2021
d3ee922
udisksmountmonitor: Provide udisks_mount_monitor_get_mounts_for_fs_uu…
tbzatek Jan 13, 2021
6fe604e
udiskslinuxfilesystem: Add udisks_linux_filesystem_is_volume_based()
tbzatek Jan 14, 2021
1d43218
udiskslinuxfilesystem: Match mountpoints by ID_FS_UUID for volume-bas…
tbzatek Jan 14, 2021
62a78d5
udisksstate: Filesystem UUID support for mountpoint cleanup
tbzatek Jan 20, 2021
90f41c3
udiskslinuxfilesystem: Add udisks_linux_filesystem_find_siblings()
tbzatek Jan 22, 2021
95d8ea2
udiskslinuxfilesystem: Trigger uevent on sibling devices in case of a…
tbzatek Jan 22, 2021
8d04e96
btrfs: Trigger uevent on sibling devices
tbzatek Jan 22, 2021
dfcfc2b
udiskslinuxblockobject: Add support for volume-based filesystems in m…
tbzatek Jan 6, 2022
29815d0
tests: Add btrfs multidisk volume tests
tbzatek Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/udisks2-sections.txt.daemon.sections.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@ UDisksMountType
udisks_mount_get_dev
udisks_mount_get_mount_type
udisks_mount_get_mount_path
udisks_mount_get_fs_uuid
udisks_mount_compare
UDisksMountMonitor
udisks_mount_monitor_new
udisks_mount_monitor_get_mounts_for_dev
udisks_mount_monitor_get_mounts_for_fs_uuid
udisks_mount_monitor_is_dev_in_use
<SUBSECTION Standard>
UDISKS_TYPE_MOUNT
Expand Down Expand Up @@ -358,6 +360,8 @@ udisks_linux_block_get_type
UDisksLinuxFilesystem
udisks_linux_filesystem_new
udisks_linux_filesystem_update
udisks_linux_filesystem_is_volume_based
udisks_linux_filesystem_find_siblings
<SUBSECTION Standard>
UDISKS_LINUX_FILESYSTEM
UDISKS_IS_LINUX_FILESYSTEM
Expand Down
82 changes: 81 additions & 1 deletion modules/btrfs/udiskslinuxfilesystembtrfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <src/udisksdaemonutil.h>
#include <src/udiskslinuxblockobject.h>
#include <src/udiskslinuxdevice.h>
#include <src/udiskslinuxfilesystem.h>
#include <src/udiskslogging.h>
#include <src/udisksmodule.h>
#include <src/udisksmoduleobject.h>
Expand Down Expand Up @@ -329,10 +330,13 @@ handle_set_label (UDisksFilesystemBTRFS *fs_btrfs,
GVariant *arg_options)
{
UDisksLinuxFilesystemBTRFS *l_fs_btrfs = UDISKS_LINUX_FILESYSTEM_BTRFS (fs_btrfs);
UDisksFilesystem *filesystem;
UDisksLinuxBlockObject *object = NULL;
UDisksDaemon *daemon;
GError *error = NULL;
gchar *dev_file = NULL;
GList *siblings;
GList *l;

object = udisks_daemon_util_dup_object (l_fs_btrfs, &error);
if (! object)
Expand All @@ -342,6 +346,7 @@ handle_set_label (UDisksFilesystemBTRFS *fs_btrfs,
}

daemon = udisks_module_get_daemon (UDISKS_MODULE (l_fs_btrfs->module));
filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));

/* Policy check. */
UDISKS_DAEMON_CHECK_AUTHORIZATION (daemon,
Expand All @@ -367,7 +372,19 @@ handle_set_label (UDisksFilesystemBTRFS *fs_btrfs,
goto out;
}

/* Trigger uevent on the current filesystem and all siblings */
udisks_linux_block_object_trigger_uevent_sync (object, UDISKS_DEFAULT_WAIT_TIMEOUT);
if (udisks_filesystem_btrfs_get_num_devices (fs_btrfs) > 1)
{
siblings = udisks_linux_filesystem_find_siblings (UDISKS_LINUX_FILESYSTEM (filesystem), object);
for (l = siblings; l != NULL; l = l->next)
{
UDisksLinuxBlockObject *obj = UDISKS_LINUX_BLOCK_OBJECT (l->data);
/* TODO: parallelize */
udisks_linux_block_object_trigger_uevent_sync (obj, UDISKS_DEFAULT_WAIT_TIMEOUT);
}
g_list_free_full (siblings, g_object_unref);
}

/* Complete DBus call. */
udisks_filesystem_btrfs_complete_set_label (fs_btrfs, invocation);
Expand All @@ -386,10 +403,13 @@ btrfs_subvolume_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
const gchar *polkit_message)
{
UDisksLinuxFilesystemBTRFS *l_fs_btrfs = UDISKS_LINUX_FILESYSTEM_BTRFS (fs_btrfs);
UDisksFilesystem *filesystem;
UDisksLinuxBlockObject *object = NULL;
UDisksDaemon *daemon;
GError *error = NULL;
gchar *mount_point = NULL;
GList *siblings;
GList *l;

object = udisks_daemon_util_dup_object (l_fs_btrfs, &error);
if (! object)
Expand All @@ -399,6 +419,7 @@ btrfs_subvolume_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
}

daemon = udisks_module_get_daemon (UDISKS_MODULE (l_fs_btrfs->module));
filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));

/* Policy check. */
UDISKS_DAEMON_CHECK_AUTHORIZATION (daemon,
Expand Down Expand Up @@ -433,7 +454,16 @@ btrfs_subvolume_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
goto out;
}

/* Trigger uevent on the current filesystem and all siblings */
udisks_linux_block_object_trigger_uevent_sync (object, UDISKS_DEFAULT_WAIT_TIMEOUT);
siblings = udisks_linux_filesystem_find_siblings (UDISKS_LINUX_FILESYSTEM (filesystem), object);
for (l = siblings; l != NULL; l = l->next)
{
UDisksLinuxBlockObject *obj = UDISKS_LINUX_BLOCK_OBJECT (l->data);
/* TODO: parallelize */
udisks_linux_block_object_trigger_uevent_sync (obj, UDISKS_DEFAULT_WAIT_TIMEOUT);
}
g_list_free_full (siblings, g_object_unref);

/* Complete DBus call. */
g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
Expand All @@ -455,13 +485,16 @@ btrfs_device_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
GVariant *arg_options)
{
UDisksLinuxFilesystemBTRFS *l_fs_btrfs = UDISKS_LINUX_FILESYSTEM_BTRFS (fs_btrfs);
UDisksFilesystem *filesystem;
UDisksLinuxBlockObject *object = NULL;
GError *error = NULL;
gchar *mount_point = NULL;
const gchar *device;
UDisksDaemon *daemon;
UDisksObject *new_device_object = NULL;
UDisksBlock *new_device_block = NULL;
GList *siblings;
GList *l;

object = udisks_daemon_util_dup_object (fs_btrfs, &error);
if (! object)
Expand All @@ -471,6 +504,7 @@ btrfs_device_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
}

daemon = udisks_module_get_daemon (UDISKS_MODULE (l_fs_btrfs->module));
filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));

/* Policy check. */
UDISKS_DAEMON_CHECK_AUTHORIZATION (daemon,
Expand Down Expand Up @@ -519,9 +553,25 @@ btrfs_device_perform_action (UDisksFilesystemBTRFS *fs_btrfs,
goto out;
}

/* Trigger uevent on the filesystem and on the added/removed device */
/* Trigger uevent on the current filesystem and all siblings */
udisks_linux_block_object_trigger_uevent_sync (object, UDISKS_DEFAULT_WAIT_TIMEOUT);
/* Avoid potential race condition with udev or UDisks not yet finished
* probing the newly added/removed device.
*/
udisks_daemon_util_trigger_uevent_sync (daemon, device, NULL, UDISKS_DEFAULT_WAIT_TIMEOUT);
siblings = udisks_linux_filesystem_find_siblings (UDISKS_LINUX_FILESYSTEM (filesystem), object);
for (l = siblings; l != NULL; l = l->next)
{
UDisksLinuxBlockObject *obj = UDISKS_LINUX_BLOCK_OBJECT (l->data);
gchar *obj_device_file;

/* TODO: parallelize */
obj_device_file = udisks_linux_block_object_get_device_file (obj);
if (g_strcmp0 (obj_device_file, device) != 0)
udisks_linux_block_object_trigger_uevent_sync (obj, UDISKS_DEFAULT_WAIT_TIMEOUT);
g_free (obj_device_file);
}
g_list_free_full (siblings, g_object_unref);

/* Complete DBus call. */
g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
Expand Down Expand Up @@ -732,10 +782,13 @@ handle_repair (UDisksFilesystemBTRFS *fs_btrfs,
GVariant *arg_options)
{
UDisksLinuxFilesystemBTRFS *l_fs_btrfs = UDISKS_LINUX_FILESYSTEM_BTRFS (fs_btrfs);
UDisksFilesystem *filesystem;
UDisksLinuxBlockObject *object = NULL;
UDisksDaemon *daemon;
GError *error = NULL;
gchar *dev_file = NULL;
GList *siblings;
GList *l;

object = udisks_daemon_util_dup_object (l_fs_btrfs, &error);
if (! object)
Expand All @@ -745,6 +798,7 @@ handle_repair (UDisksFilesystemBTRFS *fs_btrfs,
}

daemon = udisks_module_get_daemon (UDISKS_MODULE (l_fs_btrfs->module));
filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));

/* Policy check. */
UDISKS_DAEMON_CHECK_AUTHORIZATION (daemon,
Expand All @@ -771,6 +825,17 @@ handle_repair (UDisksFilesystemBTRFS *fs_btrfs,
}

udisks_linux_block_object_trigger_uevent_sync (object, UDISKS_DEFAULT_WAIT_TIMEOUT);
if (udisks_filesystem_btrfs_get_num_devices (fs_btrfs) > 1)
{
siblings = udisks_linux_filesystem_find_siblings (UDISKS_LINUX_FILESYSTEM (filesystem), object);
for (l = siblings; l != NULL; l = l->next)
{
UDisksLinuxBlockObject *obj = UDISKS_LINUX_BLOCK_OBJECT (l->data);
/* TODO: parallelize */
udisks_linux_block_object_trigger_uevent_sync (obj, UDISKS_DEFAULT_WAIT_TIMEOUT);
}
g_list_free_full (siblings, g_object_unref);
}

/* Complete DBus call. */
udisks_filesystem_btrfs_complete_repair (fs_btrfs, invocation);
Expand All @@ -790,10 +855,13 @@ handle_resize (UDisksFilesystemBTRFS *fs_btrfs,
GVariant *arg_options)
{
UDisksLinuxFilesystemBTRFS *l_fs_btrfs = UDISKS_LINUX_FILESYSTEM_BTRFS (fs_btrfs);
UDisksFilesystem *filesystem;
UDisksLinuxBlockObject *object = NULL;
UDisksDaemon *daemon;
GError *error = NULL;
gchar *mount_point = NULL;
GList *siblings;
GList *l;

object = udisks_daemon_util_dup_object (l_fs_btrfs, &error);
if (! object)
Expand All @@ -803,6 +871,7 @@ handle_resize (UDisksFilesystemBTRFS *fs_btrfs,
}

daemon = udisks_module_get_daemon (UDISKS_MODULE (l_fs_btrfs->module));
filesystem = udisks_object_peek_filesystem (UDISKS_OBJECT (object));

/* Policy check. */
UDISKS_DAEMON_CHECK_AUTHORIZATION (daemon,
Expand All @@ -828,6 +897,17 @@ handle_resize (UDisksFilesystemBTRFS *fs_btrfs,
}

udisks_linux_block_object_trigger_uevent_sync (object, UDISKS_DEFAULT_WAIT_TIMEOUT);
if (udisks_filesystem_btrfs_get_num_devices (fs_btrfs) > 1)
{
siblings = udisks_linux_filesystem_find_siblings (UDISKS_LINUX_FILESYSTEM (filesystem), object);
for (l = siblings; l != NULL; l = l->next)
{
UDisksLinuxBlockObject *obj = UDISKS_LINUX_BLOCK_OBJECT (l->data);
/* TODO: parallelize */
udisks_linux_block_object_trigger_uevent_sync (obj, UDISKS_DEFAULT_WAIT_TIMEOUT);
}
g_list_free_full (siblings, g_object_unref);
}

/* Complete DBus call. */
udisks_filesystem_btrfs_complete_resize (fs_btrfs, invocation);
Expand Down
Loading