[gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.9.0-diskio-dmmajor.patch

[Daniel Pielmeier (billie)]

billie      13/11/29 15:27:13

  Added:                conky-1.9.0-diskio-dmmajor.patch
  Log:
  Fix byte counting on dmcrypt devices. Thanks to Stefan Huber for the patch.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 215AD14D)

Revision  Changes    Path
1.1                  app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch?rev=1.1&content-type=text/plain

Index: conky-1.9.0-diskio-dmmajor.patch
===================================================================
diff --git a/src/.linux.c.swp b/src/.linux.c.swp
index 909d454..f6fc388 100644
Binary files a/src/.linux.c.swp and b/src/.linux.c.swp differ
diff --git a/src/linux.c b/src/linux.c
index ce5f733..bbf8dc5 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -80,6 +80,10 @@
 #define NBD_MAJOR 43
 #endif
 
+#if !defined(DM_MAJOR)
+#define DM_MAJOR 253
+#endif
+
 #ifdef HAVE_IWLIB
 #include <iwlib.h>
 #endif
@@ -2336,7 +2340,8 @@ int update_diskio(void)
 		 *
 		 * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */
 		if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR
-				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
+				&& major != RAMDISK_MAJOR && major != LOOP_MAJOR
+				&& major != DM_MAJOR ) {
 			/* check needed for kernel >= 2.6.31, see sf #2942117 */
 			if (is_disk(devbuf)) {
 				total_reads += reads;