From 26b05baf2bc752f84f5f9179c3d8345f5a545fec Mon Sep 17 00:00:00 2001 From: Sebastian Geiger Date: Sat, 26 May 2018 17:27:07 +0200 Subject: multiload: ignore priviledged mount points fixes https://github.com/mate-desktop/mate-applets/issues/230 origin commit: https://gitlab.gnome.org/GNOME/gnome-applets/commit/daadbbc --- multiload/linux-proc.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'multiload/linux-proc.c') diff --git a/multiload/linux-proc.c b/multiload/linux-proc.c index 0e4624d6..fcd48bff 100644 --- a/multiload/linux-proc.c +++ b/multiload/linux-proc.c @@ -1,6 +1,7 @@ /* From wmload.c, v0.9.2, licensed under the GPL. */ #include #include +#include #include #include #include @@ -119,6 +120,7 @@ GetDiskLoad (int Maximum, int data [3], LoadGraph *g) for (i = 0; i < mountlist.number; i++) { + struct statvfs statresult; glibtop_fsusage fsusage; if (strcmp(mountentries[i].type, "smbfs") == 0 @@ -126,6 +128,13 @@ GetDiskLoad (int Maximum, int data [3], LoadGraph *g) || strcmp(mountentries[i].type, "cifs") == 0) continue; + if (statvfs (mountentries[i].mountdir, &statresult) < 0) + { + g_debug ("Failed to get statistics for mount entry: %s. Reason: %s. Skipping entry.", + mountentries[i].mountdir, strerror(errno)); + continue; + } + glibtop_get_fsusage(&fsusage, mountentries[i].mountdir); read += fsusage.read; write += fsusage.write; } -- cgit v1.2.1