diff --git a/udisks-1.93.0-fix-unmounting-large-disks.patch b/udisks-1.93.0-fix-unmounting-large-disks.patch new file mode 100644 index 0000000..9f9d62b --- /dev/null +++ b/udisks-1.93.0-fix-unmounting-large-disks.patch @@ -0,0 +1,40 @@ +From 5dd2ef0710584626f81a89b81180fa81d04b6956 Mon Sep 17 00:00:00 2001 +From: Edward Sheldrake +Date: Sun, 1 Apr 2012 15:58:08 +0100 +Subject: [PATCH] Fix unmounting large disks when not asked to + +udisks2 was "Cleaning up mount point" claiming the device no longer existed. +Disk size may be larger than INT_MAX for large disks. + +https://bugs.freedesktop.org/show_bug.cgi?id=48155 + +Signed-off-by: David Zeuthen +--- + src/udiskscleanup.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/udiskscleanup.c b/src/udiskscleanup.c +index b5b61c1..9daa980 100644 +--- a/src/udiskscleanup.c ++++ b/src/udiskscleanup.c +@@ -605,7 +605,7 @@ udisks_cleanup_check_mounted_fs_entry (UDisksCleanup *cleanup, + /* if umounting, issue 'change' event on the device after unmounting it */ + change_sysfs_path = g_strdup (g_udev_device_get_sysfs_path (udev_device)); + +- if (g_udev_device_get_sysfs_attr_as_int (udev_device, "size") > 0) ++ if (g_udev_device_get_sysfs_attr_as_uint64 (udev_device, "size") > 0) + { + /* for partition, also check enclosing device */ + if (g_strcmp0 (g_udev_device_get_devtype (udev_device), "partition") == 0) +@@ -614,7 +614,7 @@ udisks_cleanup_check_mounted_fs_entry (UDisksCleanup *cleanup, + udev_device_disk = g_udev_device_get_parent_with_subsystem (udev_device, "block", "disk"); + if (udev_device_disk != NULL) + { +- if (g_udev_device_get_sysfs_attr_as_int (udev_device_disk, "size") > 0) ++ if (g_udev_device_get_sysfs_attr_as_uint64 (udev_device_disk, "size") > 0) + { + device_exists = TRUE; + } +-- +1.7.9.3 + diff --git a/udisks2.spec b/udisks2.spec index 3917169..ee301a0 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -8,7 +8,7 @@ Summary: Disk Manager Name: udisks2 Version: 1.93.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -51,6 +51,8 @@ Requires: acl # for /proc/self/mountinfo, only available in 2.6.26 or higher Conflicts: kernel < 2.6.26 +Patch0: udisks-1.93.0-fix-unmounting-large-disks.patch + %description udisks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. This package is for the udisks 2.x @@ -80,6 +82,7 @@ daemon. This package is for the udisks 2.x series. %prep %setup -q -n udisks-%{version} +%patch0 -p1 %build %configure --enable-gtk-doc @@ -137,6 +140,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Tue Apr 03 2012 David Zeuthen - 1.93.0-2%{?dist} +- Don't inadvertently unmount large block devices (fdo #48155) + * Mon Mar 05 2012 David Zeuthen - 1.93.0-1%{?dist} - Update to release 1.93.0