Index: uspace/srv/bd/hr/metadata/native.c
===================================================================
--- uspace/srv/bd/hr/metadata/native.c	(revision 58c43d463db984d9c3b62094468eaba2f9c04359)
+++ uspace/srv/bd/hr/metadata/native.c	(revision 6a854c51246232c1010764cc8a5b624467a413e8)
@@ -99,9 +99,9 @@
 }
 
-static errno_t meta_native_init_vol2meta(const hr_volume_t *vol, void *mdp)
-{
-	HR_DEBUG("%s()", __func__);
-
-	hr_metadata_t *md = (hr_metadata_t *)mdp;
+static errno_t meta_native_init_vol2meta(const hr_volume_t *vol, void *md_v)
+{
+	HR_DEBUG("%s()", __func__);
+
+	hr_metadata_t *md = md_v;
 
 	str_cpy(md->magic, HR_NATIVE_MAGIC_SIZE, HR_NATIVE_MAGIC_STR);
@@ -194,9 +194,9 @@
 }
 
-static void meta_native_encode(const void *mdp, void *block)
-{
-	HR_DEBUG("%s()", __func__);
-
-	const hr_metadata_t *metadata = (hr_metadata_t *)mdp;
+static void meta_native_encode(const void *md_v, void *block)
+{
+	HR_DEBUG("%s()", __func__);
+
+	const hr_metadata_t *metadata = md_v;
 
 	/*
@@ -228,9 +228,9 @@
 }
 
-static void meta_native_decode(const void *block, void *mdp)
-{
-	HR_DEBUG("%s()", __func__);
-
-	hr_metadata_t *metadata = (hr_metadata_t *)mdp;
+static void meta_native_decode(const void *block, void *md_v)
+{
+	HR_DEBUG("%s()", __func__);
+
+	hr_metadata_t *metadata = md_v;
 
 	/*
@@ -333,9 +333,9 @@
 }
 
-static bool meta_native_has_valid_magic(const void *mdp)
-{
-	HR_DEBUG("%s()", __func__);
-
-	const hr_metadata_t *md = (hr_metadata_t *)mdp;
+static bool meta_native_has_valid_magic(const void *md_v)
+{
+	HR_DEBUG("%s()", __func__);
+
+	const hr_metadata_t *md = md_v;
 
 	if (str_lcmp(md->magic, HR_NATIVE_MAGIC_STR, HR_NATIVE_MAGIC_SIZE) != 0)
@@ -355,9 +355,9 @@
 }
 
-static void meta_native_inc_counter(void *m)
-{
-	hr_metadata_t *meta = (hr_metadata_t *)m;
-
-	meta->counter++;
+static void meta_native_inc_counter(void *md_v)
+{
+	hr_metadata_t *md = md_v;
+
+	md->counter++;
 }
 
@@ -412,17 +412,16 @@
 }
 
-
-static const char *meta_native_get_devname(const void *m)
-{
-	hr_metadata_t *meta = (hr_metadata_t *)m;
-
-	return meta->devname;
-}
-
-static hr_level_t meta_native_get_level(const void *m)
-{
-	hr_metadata_t *meta = (hr_metadata_t *)m;
-
-	return meta->level;
+static const char *meta_native_get_devname(const void *md_v)
+{
+	const hr_metadata_t *md = md_v;
+
+	return md->devname;
+}
+
+static hr_level_t meta_native_get_level(const void *md_v)
+{
+	const hr_metadata_t *md = md_v;
+
+	return md->level;
 }
 
@@ -451,9 +450,9 @@
 }
 
-static void meta_native_dump(const void *mdp)
-{
-	HR_DEBUG("%s()", __func__);
-
-	const hr_metadata_t *metadata = (hr_metadata_t *)mdp;
+static void meta_native_dump(const void *md_v)
+{
+	HR_DEBUG("%s()", __func__);
+
+	const hr_metadata_t *metadata = md_v;
 
 	printf("\tmagic: %s\n", metadata->magic);