[gvfs/wip/udisks2] Catch up with udisks change from major/minor to dev_t



commit 90e8e5989558fdb481946da46de86d8d29f27237
Author: David Zeuthen <davidz redhat com>
Date:   Sun Oct 30 12:27:05 2011 -0400

    Catch up with udisks change from major/minor to dev_t
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 monitor/udisks2/gvfsudisks2drive.c  |    2 +-
 monitor/udisks2/gvfsudisks2volume.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c
index c58b858..3b53fc1 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 37004e1..dd68329 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]