[gnome-disk-utility/gnome-3-26] Revert "Keep FS mounted while growing partition"

[Kai Lüke <kailueke src gnome org>]

commit 6fdaad883fe29ae94a38ed655d3cd2fcaa44d194
Author: Kai Lüke <kailueke riseup net>
Date:   Mon Oct 2 22:31:45 2017 +0900

    Revert "Keep FS mounted while growing partition"
    
    This reverts commit 6eeaa375b9e5dfbc1c76e3fa02cb7746adc82b33.

 src/disks/gduresizedialog.c |  192 +++++++++++--------------------------------
 1 files changed, 50 insertions(+), 142 deletions(-)
---
diff --git a/src/disks/gduresizedialog.c b/src/disks/gduresizedialog.c
index 2cea465..c224bcc 100644
--- a/src/disks/gduresizedialog.c
+++ b/src/disks/gduresizedialog.c
@@ -513,24 +513,22 @@ part_resize_cb_online_next_fs_resize (UDisksPartition  *partition,
 }
 
 static void
-fs_repair_cb_offline_next_grow (UDisksFilesystem *filesystem,
-                                GAsyncResult     *res,
-                                ResizeDialogData *data)
+part_resize_cb_offline_next_fs_resize (UDisksPartition  *partition,
+                                       GAsyncResult     *res,
+                                       ResizeDialogData *data)
 {
   GError *error = NULL;
-  gboolean success = FALSE;
 
-  if (!udisks_filesystem_call_repair_finish (filesystem, &success, res, &error) || !success)
+  if (!udisks_partition_call_resize_finish (partition, res, &error))
     {
       gdu_utils_show_error (GTK_WINDOW (data->window),
-                            _("Error repairing filesystem"),
+                            _("Error resizing partition"),
                             error);
       g_error_free (error);
       resize_dialog_data_unref (data);
     }
   else
     {
-      /* growing: next is to resize filesystem, then run repair again */
       udisks_filesystem_call_resize (data->filesystem, get_size (data),
                                      g_variant_new ("a{sv}", NULL), NULL,
                                      (GAsyncReadyCallback) fs_resize_cb_offline_next_repair, data);
@@ -538,57 +536,6 @@ fs_repair_cb_offline_next_grow (UDisksFilesystem *filesystem,
 }
 
 static void
-ensure_unused_cb_offline_next_repair (GObject      *source_object,
-                                      GAsyncResult *res,
-                                      gpointer      user_data)
-{
-  ResizeDialogData *data = user_data;
-  GError *error = NULL;
-
-  if (!gdu_utils_ensure_unused_finish (data->client, res, &error))
-    {
-      gdu_utils_show_error (GTK_WINDOW (data->window),
-                            _("Error unmounting filesystem for repairing"),
-                            error);
-
-      g_error_free (error);
-      resize_dialog_data_unref (data);
-    }
-  else
-    {
-      udisks_filesystem_call_repair (data->filesystem,
-                                     g_variant_new ("a{sv}", NULL), NULL,
-                                     (GAsyncReadyCallback) fs_repair_cb_offline_next_grow, data);
-    }
-}
-
-static void
-part_resize_cb_offline_next_fs_unmount (UDisksPartition  *partition,
-                                        GAsyncResult     *res,
-                                        ResizeDialogData *data)
-{
-  GError *error = NULL;
-
-  if (!udisks_partition_call_resize_finish (partition, res, &error))
-    {
-      gdu_utils_show_error (GTK_WINDOW (data->window),
-                            _("Error resizing partition"),
-                            error);
-      g_error_free (error);
-      resize_dialog_data_unref (data);
-    }
-  else
-    {
-      gdu_utils_ensure_unused (data->client,
-                               GTK_WINDOW (data->window),
-                               data->object,
-                               ensure_unused_cb_offline_next_repair,
-                               NULL,
-                               data);
-    }
-}
-
-static void
 fs_resize_cb_online_next_part_resize (UDisksFilesystem *filesystem,
                                       GAsyncResult     *res,
                                       ResizeDialogData *data)
@@ -635,7 +582,7 @@ fs_resize_cb_offline_next_fs_repair (UDisksFilesystem *filesystem,
 }
 
 static void
-fs_repair_cb_offline_next_shrink (UDisksFilesystem *filesystem,
+fs_repair_cb_offline_next_resize (UDisksFilesystem *filesystem,
                                   GAsyncResult     *res,
                                   ResizeDialogData *data)
 {
@@ -652,10 +599,20 @@ fs_repair_cb_offline_next_shrink (UDisksFilesystem *filesystem,
     }
   else
     {
-      /* shrinking: next is to resize filesystem, run repair again, then resize partition */
-      udisks_filesystem_call_resize (data->filesystem, get_size (data),
-                                     g_variant_new ("a{sv}", NULL), NULL,
-                                     (GAsyncReadyCallback) fs_resize_cb_offline_next_fs_repair, data);
+      if (is_shrinking (data))
+        {
+          /* shrinking: next is to resize filesystem, run repair, then resize partition */
+          udisks_filesystem_call_resize (data->filesystem, get_size (data),
+                                         g_variant_new ("a{sv}", NULL), NULL,
+                                         (GAsyncReadyCallback) fs_resize_cb_offline_next_fs_repair, data);
+        }
+      else
+        {
+          /* growing: next is to resize partition, then resize filesystem, run repair */
+          udisks_partition_call_resize (data->partition, get_size (data),
+                                        g_variant_new ("a{sv}", NULL), NULL,
+                                        (GAsyncReadyCallback) part_resize_cb_offline_next_fs_resize, data);
+        }
     }
 }
 
@@ -679,6 +636,18 @@ online_resize_no_repair (ResizeDialogData *data)
 }
 
 static void
+offline_resize_with_repair (ResizeDialogData *data)
+{
+  /* partition and filesystem resize:
+   * if growing fs-repair, part-resize, fs-resize, fs-repair
+   * if shrinking fs-repair, fs-resize, fs-repair, part-resize
+   */
+  udisks_filesystem_call_repair (data->filesystem,
+                                 g_variant_new ("a{sv}", NULL), NULL,
+                                 (GAsyncReadyCallback) fs_repair_cb_offline_next_resize, data);
+}
+
+static void
 unmount_cb (GObject      *source_object,
             GAsyncResult *res,
             gpointer      user_data)
@@ -697,75 +666,7 @@ unmount_cb (GObject      *source_object,
     }
   else
     {
-      /* shrinking partition and filesystem:
-       * fs-repair, fs-resize, fs-repair, part-resize
-       */
-      udisks_filesystem_call_repair (data->filesystem,
-                                     g_variant_new ("a{sv}", NULL), NULL,
-                                     (GAsyncReadyCallback) fs_repair_cb_offline_next_shrink, data);
-    }
-}
-
-static void
-resize (ResizeDialogData *data)
-{
-  gboolean shrinking;
-
-  shrinking = is_shrinking (data);
-
-  if ((!(data->support & ONLINE_SHRINK) && shrinking) ||
-      (!(data->support & ONLINE_GROW) && !shrinking))
-    {
-      if (shrinking)
-        {
-          gdu_utils_ensure_unused (data->client,
-                                   GTK_WINDOW (data->window),
-                                   data->object,
-                                   unmount_cb,
-                                   NULL,
-                                   data);
-        }
-      else
-        {
-          /* The offline grow case still needs the FS to be mounted during
-           * the partition resize to prevent any race conditions with GVFs
-           * automount but will unmount as soon as FS repair and resize take place:
-           * part-resize, fs-repair, fs-resize, fs-repair
-           */
-          udisks_partition_call_resize (data->partition, get_size (data),
-                                        g_variant_new ("a{sv}", NULL), NULL,
-                                        (GAsyncReadyCallback) part_resize_cb_offline_next_fs_unmount, data);
-        }
-    }
-  else
-    {
-      online_resize_no_repair (data);
-    }
-}
-
-static void
-mount_cb (UDisksFilesystem *filesystem,
-          GAsyncResult     *res,
-          gpointer          user_data)
-{
-  ResizeDialogData *data = (ResizeDialogData *) user_data;
-  GError *error = NULL;
-
-  if (!udisks_filesystem_call_mount_finish (filesystem,
-                                            NULL, /* out_mount_path */
-                                            res,
-                                            &error))
-    {
-      gdu_utils_show_error (GTK_WINDOW (data->window),
-                            _("Error mounting the filesystem"),
-                            error);
-
-      g_error_free (error);
-      resize_dialog_data_unref (data);
-    }
-  else
-    {
-      resize (data);
+      offline_resize_with_repair (data);
     }
 }
 
@@ -960,27 +861,34 @@ gdu_resize_dialog_show (GduWindow    *window,
 
   if (gtk_dialog_run (GTK_DIALOG (data->dialog)) == GTK_RESPONSE_APPLY)
     {
+      gboolean shrinking;
+
+      shrinking = is_shrinking (data);
+
       gtk_widget_hide (data->dialog);
       g_clear_pointer (&data->dialog, gtk_widget_destroy);
 
       if (data->filesystem != NULL)
         {
-          gboolean offline_shrink;
-
           mount_points = udisks_filesystem_get_mount_points (data->filesystem);
-          /* prevent the case of mounting when directly unmount would follow */
-          offline_shrink = !(data->support & ONLINE_SHRINK) && is_shrinking (data);
 
-          if (g_strv_length ((gchar **) mount_points) == 0 && !offline_shrink)
+          if (g_strv_length ((gchar **) mount_points) == 0)
+            {
+              offline_resize_with_repair (data);
+            }
+          else if ((!(data->support & ONLINE_SHRINK) && shrinking) ||
+                   (!(data->support & ONLINE_GROW) && !shrinking))
             {
-              /* FS was unmounted by the user while the dialog stayed open */
-              udisks_filesystem_call_mount (data->filesystem,
-                                            g_variant_new ("a{sv}", NULL), NULL,
-                                            (GAsyncReadyCallback) mount_cb, data);
+              gdu_utils_ensure_unused (data->client,
+                                       GTK_WINDOW (window),
+                                       object,
+                                       unmount_cb,
+                                       NULL,
+                                       data);
             }
           else
             {
-              resize (data);
+              online_resize_no_repair (data);
             }
         }
       else