From: | "Daniel Pielmeier (billie)" <billie@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-admin/conky/files: conky-1.9.0-diskio-dmmajor.patch |
Date: | Fri, 29 Nov 2013 15:27:19 |
Message-Id: | 20131129152714.07E6E2004E@flycatcher.gentoo.org |
1 | billie 13/11/29 15:27:13 |
2 | |
3 | Added: conky-1.9.0-diskio-dmmajor.patch |
4 | Log: |
5 | Fix byte counting on dmcrypt devices. Thanks to Stefan Huber for the patch. |
6 | |
7 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 215AD14D) |
8 | |
9 | Revision Changes Path |
10 | 1.1 app-admin/conky/files/conky-1.9.0-diskio-dmmajor.patch |
11 | |
12 | 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 |
13 | 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 |
14 | |
15 | Index: conky-1.9.0-diskio-dmmajor.patch |
16 | =================================================================== |
17 | diff --git a/src/.linux.c.swp b/src/.linux.c.swp |
18 | index 909d454..f6fc388 100644 |
19 | Binary files a/src/.linux.c.swp and b/src/.linux.c.swp differ |
20 | diff --git a/src/linux.c b/src/linux.c |
21 | index ce5f733..bbf8dc5 100644 |
22 | --- a/src/linux.c |
23 | +++ b/src/linux.c |
24 | @@ -80,6 +80,10 @@ |
25 | #define NBD_MAJOR 43 |
26 | #endif |
27 | |
28 | +#if !defined(DM_MAJOR) |
29 | +#define DM_MAJOR 253 |
30 | +#endif |
31 | + |
32 | #ifdef HAVE_IWLIB |
33 | #include <iwlib.h> |
34 | #endif |
35 | @@ -2336,7 +2340,8 @@ int update_diskio(void) |
36 | * |
37 | * XXX: ignore devices which are part of a SW RAID (MD_MAJOR) */ |
38 | if (col_count == 5 && major != LVM_BLK_MAJOR && major != NBD_MAJOR |
39 | - && major != RAMDISK_MAJOR && major != LOOP_MAJOR) { |
40 | + && major != RAMDISK_MAJOR && major != LOOP_MAJOR |
41 | + && major != DM_MAJOR ) { |
42 | /* check needed for kernel >= 2.6.31, see sf #2942117 */ |
43 | if (is_disk(devbuf)) { |
44 | total_reads += reads; |