Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity

Merge pull request #2 from shuber2/fix-diskio-dmcrypt-bytecounting

Browse Source 
diskio: Fix byte counting on dmcrypt block devices
This commit is contained in:
Brenden Matthews 2013-01-06 10:10:46 -08:00
commit ac644fe44e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/linux.cc
View File

@ -79,6 +79,10 @@
#define NBD_MAJOR 43
#endif
#if !defined(DM_MAJOR)
#define DM_MAJOR 253
#endif
#ifdef BUILD_WLAN
#include <iwlib.h>
#endif
@ -2435,7 +2439,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;