Merge PR #25790 into master

* refs/pull/25790/head:
	common/blkdev: Fix missing stub block_device_get_metrics() on other platforms

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-01-04 13:40:58 -06:00
commit d001dfac73

View File

@ -1001,6 +1001,13 @@ int block_device_run_smartctl(const char *device, int timeout,
return -EOPNOTSUPP;
}
int block_device_get_metrics(const string& devname, int timeout,
json_spirit::mValue *result)
{
// FIXME: implement me for freebsd
return -EOPNOTSUPP;
}
int block_device_run_nvme(const char *device, const char *vendor, int timeout,
std::string *result)
{
@ -1142,6 +1149,12 @@ int block_device_run_smartctl(const char *device, int timeout,
return -EOPNOTSUPP;
}
int block_device_get_metrics(const string& devname, int timeout,
json_spirit::mValue *result)
{
return -EOPNOTSUPP;
}
int block_device_run_nvme(const char *device, const char *vendor, int timeout,
std::string *result)
{