patches/gnome-utils-01-zfs.diff
author chrisk
Thu, 30 Jul 2009 11:17:30 +0000
changeset 16179 ae08a56b988b
parent 15452 patches/gnome-utils-08-zfs.diff@84e5e1260f44
permissions -rw-r--r--
2009-07-30 Christian Kelly <[email protected]> * base-specs/gnome-utils.spec, patches/gnome-utils-08-zfs.diff, patches/gnome-utils-01-zfs.diff: Remove reference to old patch and re-shuffle.

/jds/bin/diff -uprN gnome-utils-2.26.0.old/baobab/src/baobab-utils.c gnome-utils-2.26.0/baobab/src/baobab-utils.c
--- gnome-utils-2.26.0.old/baobab/src/baobab-utils.c	2009-03-19 15:18:55.422186000 +0000
+++ gnome-utils-2.26.0/baobab/src/baobab-utils.c	2009-03-19 15:24:04.344024000 +0000
@@ -43,36 +43,14 @@
 void
 baobab_get_filesystem (baobab_fs *fs)
 {
-	size_t i;
-	glibtop_mountlist mountlist;
-	glibtop_mountentry *mountentries;
+    glibtop_fsusage fsusage;
 
+    /* OpenSolaris using ZFS filesystem , just need to get slash usage stats */
+    glibtop_get_fsusage (&fsusage, "/");
 	memset (fs, 0, sizeof *fs);
-
-	mountentries = glibtop_get_mountlist (&mountlist, FALSE);
-
-	for (i = 0; i < mountlist.number; ++i) {
-		GFile	*file;
-		glibtop_fsusage fsusage;
-		
-		file = g_file_new_for_path(mountentries[i].mountdir);	
-
-		if (baobab_is_excluded_location (file)){
-			g_object_unref(file);
-			continue;
-			}
-
-		glibtop_get_fsusage (&fsusage, mountentries[i].mountdir);
-
-		/*  v.1.1.1 changed bavail with bfree) */
-		fs->total += fsusage.blocks * fsusage.block_size;
-		fs->avail += fsusage.bfree * fsusage.block_size;
-		fs->used += (fsusage.blocks - fsusage.bfree) * fsusage.block_size;
-		g_object_unref(file);
-
-	}
-
-	g_free (mountentries);
+	fs->total = fsusage.blocks * fsusage.block_size;
+	fs->avail = fsusage.bfree * fsusage.block_size;
+	fs->used = (fsusage.blocks - fsusage.bfree) * fsusage.block_size;
 }
 
 void