File 0001-udiskslinuxfilesystem-Refactor-internal-wh... of Package udisks2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-udiskslinuxfilesystem-Refactor-internal-whitelists.patch of Package udisks2 (Revision 1bbae7261dc7d9e87087ef1c4b4d092d)

Currently displaying revision 1bbae7261dc7d9e87087ef1c4b4d092d , Show latest

From 4a06a6ee126751af3a7ab9fc33721a904adb6850 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 4 Aug 2023 17:48:41 +0200
Subject: [PATCH] udiskslinuxfilesystem: Refactor internal whitelists

(cherry picked from commit eb7e79e0b7e5f284809965b21c96b6451662c544)
---
 src/udiskslinuxfilesystem.c | 100 +++++++++++++++++++++---------------
 1 file changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index f2e5eb60..9bfda895 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -109,6 +109,45 @@ G_DEFINE_TYPE_WITH_CODE (UDisksLinuxFilesystem, udisks_linux_filesystem, UDISKS_
 #define MOUNT_BASE_PERSISTENT FALSE
 #endif
 
+/* required for kernel module autoloading */
+static const gchar *well_known_filesystems[] =
+{
+  "bcache",
+  "bcachefs",
+  "btrfs",
+  "erofs",
+  "exfat",
+  "ext2",
+  "ext3",
+  "ext4",
+  "f2fs",
+  "hfs",
+  "hfsplus",
+  "iso9660",
+  "jfs",
+  "msdos",
+  "nilfs",
+  "nilfs2",
+  "ntfs",
+  "ntfs3",
+  "udf",
+  "reiserfs",
+  "reiser4",
+  "reiser5",
+  "umsdos",
+  "vfat",
+  "xfs",
+};
+
+/* filesystems known to report their outer boundaries */
+static const gchar *fs_lastblock_list[] =
+{
+  "ext2",
+  "ext3",
+  "ext4",
+  "xfs",
+};
+
 /* ---------------------------------------------------------------------------------------------------- */
 
 static void
@@ -199,6 +238,17 @@ udisks_linux_filesystem_new (void)
 
 /* ---------------------------------------------------------------------------------------------------- */
 
+static gboolean
+in_fs_lastblock_list (const gchar *fstype)
+{
+  guint n;
+
+  for (n = 0; n < G_N_ELEMENTS (fs_lastblock_list); n++)
+    if (g_strcmp0 (fs_lastblock_list[n], fstype) == 0)
+      return TRUE;
+  return FALSE;
+}
+
 /* WARNING: called with GDBusObjectManager lock held, avoid any object lookup */
 static guint64
 get_filesystem_size (UDisksLinuxFilesystem *filesystem)
@@ -211,6 +261,10 @@ get_filesystem_size (UDisksLinuxFilesystem *filesystem)
   if (!filesystem->cached_device_file || !filesystem->cached_fs_type)
     return 0;
 
+  /* manually getting size is supported only for Ext and XFS */
+  if (!in_fs_lastblock_list (filesystem->cached_fs_type))
+    return 0;
+
   /* if the drive is ATA and is sleeping, skip filesystem size check to prevent
    * drive waking up - nothing has changed anyway since it's been sleeping...
    */
@@ -352,37 +406,6 @@ udisks_linux_filesystem_update (UDisksLinuxFilesystem  *filesystem,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-/* required for kernel module autoloading */
-static const gchar *well_known_filesystems[] =
-{
-  "bcache",
-  "bcachefs",
-  "btrfs",
-  "erofs",
-  "exfat",
-  "ext2",
-  "ext3",
-  "ext4",
-  "f2fs",
-  "hfs",
-  "hfsplus",
-  "iso9660",
-  "jfs",
-  "msdos",
-  "nilfs",
-  "nilfs2",
-  "ntfs",
-  "ntfs3",
-  "udf",
-  "reiserfs",
-  "reiser4",
-  "reiser5",
-  "umsdos",
-  "vfat",
-  "xfs",
-  NULL,
-};
-
 static gboolean
 is_in_filesystem_file (const gchar *filesystems_file,
                        const gchar *fstype)
@@ -432,19 +455,12 @@ is_in_filesystem_file (const gchar *filesystems_file,
 static gboolean
 is_well_known_filesystem (const gchar *fstype)
 {
-  gboolean ret = FALSE;
   guint n;
 
-  for (n = 0; well_known_filesystems[n] != NULL; n++)
-    {
-      if (g_strcmp0 (well_known_filesystems[n], fstype) == 0)
-        {
-          ret = TRUE;
-          goto out;
-        }
-    }
- out:
-  return ret;
+  for (n = 0; n < G_N_ELEMENTS (well_known_filesystems); n++)
+    if (g_strcmp0 (well_known_filesystems[n], fstype) == 0)
+      return TRUE;
+  return FALSE;
 }
 
 /* this is not a very efficient implementation but it's very rarely
-- 
2.42.0

Places

File 0001-udiskslinuxfilesystem-Refactor-internal-whitelists.patch of Package udisks2 (Revision 1bbae7261dc7d9e87087ef1c4b4d092d)

Places