projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
826293b
)
disk plugin: Call disk_udev_attr_name() only when UdevNameAttr configured
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Wed, 25 May 2016 07:15:31 +0000
(13:15 +0600)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Wed, 25 May 2016 07:15:31 +0000
(13:15 +0600)
src/disk.c
patch
|
blob
|
history
diff --git
a/src/disk.c
b/src/disk.c
index
0d62488
..
07383c7
100644
(file)
--- a/
src/disk.c
+++ b/
src/disk.c
@@
-867,9
+867,13
@@
static int disk_read (void)
output_name = disk_name;
#if HAVE_LIBUDEV
output_name = disk_name;
#if HAVE_LIBUDEV
- char *alt_name = disk_udev_attr_name (handle_udev, disk_name, conf_udev_name_attr);
- if (alt_name != NULL)
- output_name = alt_name;
+ char *alt_name = NULL;
+ if (conf_udev_name_attr != NULL)
+ {
+ alt_name = disk_udev_attr_name (handle_udev, disk_name, conf_udev_name_attr);
+ if (alt_name != NULL)
+ output_name = alt_name;
+ }
#endif
if (ignorelist_match (ignorelist, output_name) != 0)
#endif
if (ignorelist_match (ignorelist, output_name) != 0)