Attachment 593779 Details for Bug 804890 – sysstat-7.0.2-sysfs-devname.patch

[patch] sysstat-7.0.2-sysfs-devname.patch

sysstat-7.0.2-sysfs-devname.patch (text/plain), 1.90 KB, created by Peter Schiffer on 2012-06-22 15:17:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Schiffer

Created: 2012-06-22 15:17:23 UTC

Size: 1.90 KB

patch

obsolete

>diff -upr sysstat-7.0.2.orig/sa_common.c sysstat-7.0.2/sa_common.c
>--- sysstat-7.0.2.orig/sa_common.c	2012-06-22 16:54:05.497367295 +0200
>+++ sysstat-7.0.2/sa_common.c	2012-06-22 16:57:51.836753718 +0200
>@@ -27,6 +27,7 @@
> #include <unistd.h>	/* For STDOUT_FILENO, among others */
> #include <dirent.h>
> #include <fcntl.h>
>+#include <libgen.h>
> #include <sys/types.h>
> #include <sys/ioctl.h>
> 
>@@ -150,6 +151,42 @@ void salloc_disk_array(struct disk_stats
> 
> /*
>  ***************************************************************************
>+ * Try to get device real name from sysfs tree.
>+ *
>+ * IN:
>+ * @major	Major number of the device.
>+ * @minor	Minor number of the device.
>+ *
>+ * RETURNS:
>+ * The name of the device, which may be the real name (as it appears in /dev)
>+ * or NULL.
>+ ***************************************************************************
>+ */
>+char *get_devname_from_sysfs(unsigned int major, unsigned int minor)
>+{
>+	static char link[32], target[PATH_MAX];
>+	char *devname;
>+	ssize_t r;
>+
>+	snprintf(link, 32, "/sys/dev/block/%d:%d", major, minor);
>+
>+	r = readlink(link, target, PATH_MAX);
>+	if (r <= 0 || r >= PATH_MAX) {
>+		return (NULL);
>+	}
>+
>+	target[r] = '\0';
>+
>+	devname = basename(target);
>+	if (!devname || strnlen(devname, FILENAME_MAX) == 0) {
>+		return (NULL);
>+	}
>+
>+	return (devname);
>+}
>+
>+/*
>+ ***************************************************************************
>  * Get device real name if possible.
>  * Warning: This routine may return a bad name on 2.4 kernels where
>  * disk activities are read from /proc/stat.
>@@ -164,10 +201,12 @@ char *get_devname(unsigned int major, un
> 
>    if (!pretty)
>       return (buf);
>-   if ((name = ioc_name(major, minor)) == NULL)
>-      return (buf);
>+   if ((name = ioc_name(major, minor)) != NULL)
>+      return (name);
>+   if ((name = get_devname_from_sysfs(major, minor)) != NULL)
>+      return (name);
> 
>-   return (name);
>+   return (buf);
> }
> 
>

Actions: View | Diff

Attachments on bug 804890: 593779 | 862934