summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2011-10-30 12:27:05 -0400
committerDavid Zeuthen <davidz@redhat.com>2011-10-30 12:27:05 -0400
commit90e8e5989558fdb481946da46de86d8d29f27237 (patch)
treed7e8e5c6f339539802b2ddad58f1e5619720805e
parentea4e18b0f452ca8058a28a2202ef858df57b837d (diff)
downloadgvfs-90e8e5989558fdb481946da46de86d8d29f27237.tar.gz
Catch up with udisks change from major/minor to dev_t
Signed-off-by: David Zeuthen <davidz@redhat.com>
-rw-r--r--monitor/udisks2/gvfsudisks2drive.c2
-rw-r--r--monitor/udisks2/gvfsudisks2volume.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c
index c58b858c..3b53fc12 100644
--- a/monitor/udisks2/gvfsudisks2drive.c
+++ b/monitor/udisks2/gvfsudisks2drive.c
@@ -165,7 +165,7 @@ update_drive (GVfsUDisks2Drive *drive)
if (block != NULL)
{
drive->device_file = udisks_block_dup_device (block);
- drive->dev = makedev (udisks_block_get_major (block), udisks_block_get_minor (block));
+ drive->dev = udisks_block_get_device_number (block);
g_object_unref (block);
}
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index 37004e14..dd683293 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -226,7 +226,7 @@ update_volume (GVfsUDisks2Volume *volume)
else
block = volume->block;
- volume->dev = makedev (udisks_block_get_major (block), udisks_block_get_minor (block));
+ volume->dev = udisks_block_get_device_number (block);
volume->device_file = udisks_block_dup_device (block);
if (strlen (udisks_block_get_id_label (block)) > 0)