From 459cd56f51024e9de3c131aaa30ff317e1229619 Mon Sep 17 00:00:00 2001
From: David Zeuthen <zeuthen@gmail.com>
Date: Wed, 5 Sep 2012 14:51:04 -0400
Subject: [PATCH] Add Block:MDRaid and Block:MDRaidMember properties pointing
 to MDRaid objects

This allows the UI to easily associate block devices with raid
objects. Convenience API on UDisksClient to follow shortly.

Also fix up some of the documentation.

Signed-off-by: David Zeuthen <zeuthen@gmail.com>
---
 data/org.freedesktop.UDisks2.xml | 25 +++++++++++---
 doc/udisks2-docs.xml             |  2 +-
 src/udiskslinuxblock.c           | 71 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/data/org.freedesktop.UDisks2.xml b/data/org.freedesktop.UDisks2.xml
index de94329..82bb680 100644
--- a/data/org.freedesktop.UDisks2.xml
+++ b/data/org.freedesktop.UDisks2.xml
@@ -702,6 +702,20 @@
       -->
     <property name="Drive" type="o" access="read"/>
 
+    <!-- MDRaid:
+         If the block device is a running MD-RAID array, this is set
+         to the #org.freedesktop.UDisks2.MDRaid object that it
+         correspond to. Is '/' if no such object exists.
+      -->
+    <property name="MDRaid" type="o" access="read"/>
+
+    <!-- MDRaidMember:
+         If the block device is part a member of a MD-RAID array, this
+         is set to the #org.freedesktop.UDisks2.MDRaid object that it
+         correspond to. Is '/' if no such object exists.
+      -->
+    <property name="MDRaidMember" type="o" access="read"/>
+
     <!-- IdUsage:
          A result of probing for signatures on the block device. Known values include:
          <variablelist>
@@ -1564,11 +1578,14 @@
       org.freedesktop.UDisks2.MDRaid:
       @short_description: Linux Software RAID
 
-      This interface is used to represent Linux Software RAID arrays
-      detected on the system (both running an not running).
+      Objects implementing this interface represent
+      <ulink url="https://raid.wiki.kernel.org/index.php/Linux_Raid">Linux Software RAID arrays</ulink>
+      detected on the system. Both running and not-running arrays are represented.
 
-      Note that this interface does not correspond to low-level block
-      devices, see TODO.
+      Block devices point to objects implementing this interface, see
+      the #org.freedesktop.UDisks2.Block:MDRaid and
+      #org.freedesktop.UDisks2.Block:MDRaidMember properties on the
+      #org.freedesktop.UDisks2.Block D-Bus interface.
   -->
   <interface name="org.freedesktop.UDisks2.MDRaid">
     <!-- UUID:
diff --git a/doc/udisks2-docs.xml b/doc/udisks2-docs.xml
index 8bd5a2b..26d58e0 100644
--- a/doc/udisks2-docs.xml
+++ b/doc/udisks2-docs.xml
@@ -121,7 +121,7 @@
         <para>
           Objects with object paths starting with
           <literal>/org/freedesktop/UDisks2/mdraid/</literal>
-          all represent <ulink url="http://en.wikipedia.org/wiki/Disk_drive_TODO">Linux Software RAID arrays</ulink>.
+          represent <ulink url="https://raid.wiki.kernel.org/index.php/Linux_Raid">Linux Software RAID arrays</ulink>.
           Such objects implement the
           <link linkend="gdbus-interface-org-freedesktop-UDisks2-MDRaid.top_of_page">org.freedesktop.UDisks2.MDRaid</link>
           D-Bus interface.
diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c
index 18402b5..a487553 100644
--- a/src/udiskslinuxblock.c
+++ b/src/udiskslinuxblock.c
@@ -54,6 +54,7 @@
 #include "udisksbasejob.h"
 #include "udiskssimplejob.h"
 #include "udiskslinuxdriveata.h"
+#include "udiskslinuxmdraidobject.h"
 
 /**
  * SECTION:udiskslinuxblock
@@ -235,6 +236,75 @@ find_drive (GDBusObjectManagerServer  *object_manager,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static UDisksLinuxMDRaidObject *
+find_mdraid (GDBusObjectManagerServer  *object_manager,
+             const gchar               *md_uuid)
+{
+  UDisksLinuxMDRaidObject *ret = NULL;
+  GList *objects = NULL, *l;
+
+  objects = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (object_manager));
+  for (l = objects; l != NULL; l = l->next)
+    {
+      GDBusObjectSkeleton *object = G_DBUS_OBJECT_SKELETON (l->data);
+      if (UDISKS_IS_LINUX_MDRAID_OBJECT (object))
+        {
+          UDisksMDRaid *mdraid = udisks_object_get_mdraid (UDISKS_OBJECT (object));
+          if (mdraid != NULL)
+            {
+              if (g_strcmp0 (udisks_mdraid_get_uuid (mdraid), md_uuid) == 0)
+                {
+                  ret = g_object_ref (object);
+                  g_object_unref (mdraid);
+                  goto out;
+                }
+              g_object_unref (mdraid);
+            }
+        }
+    }
+
+ out:
+  g_list_foreach (objects, (GFunc) g_object_unref, NULL);
+  g_list_free (objects);
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+update_mdraid (UDisksLinuxBlock         *block,
+               GUdevDevice              *device,
+               UDisksDrive              *drive,
+               GDBusObjectManagerServer *object_manager)
+{
+  UDisksBlock *iface = UDISKS_BLOCK (block);
+  const gchar *md_uuid;
+  const gchar *objpath_mdraid = "/";
+  const gchar *objpath_mdraid_member = "/";
+  UDisksLinuxMDRaidObject *object = NULL;
+
+  md_uuid = g_udev_device_get_property (device, "MD_UUID");
+  if (md_uuid == NULL || strlen (md_uuid) == 0)
+    goto out;
+
+  object = find_mdraid (object_manager, md_uuid);
+  if (object == NULL)
+    goto out;
+
+  /* TODO: find a better way to distinguish member vs array ? */
+  if (g_str_has_prefix (g_udev_device_get_device_file (device), "/dev/md"))
+    objpath_mdraid = g_dbus_object_get_object_path (G_DBUS_OBJECT (object));
+  else
+    objpath_mdraid_member = g_dbus_object_get_object_path (G_DBUS_OBJECT (object));
+
+ out:
+  udisks_block_set_mdraid (iface, objpath_mdraid);
+  udisks_block_set_mdraid_member (iface, objpath_mdraid_member);
+  g_clear_object (&object);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
 static void
 update_hints (UDisksLinuxBlock  *block,
               GUdevDevice       *device,
@@ -774,6 +844,7 @@ udisks_linux_block_update (UDisksLinuxBlock        *block,
 
   update_hints (block, device, drive);
   update_configuration (block, daemon);
+  update_mdraid (block, device, drive, object_manager);
 
  out:
   if (device != NULL)
-- 
2.7.4