[lvm-devel] master - cleanup: move cast to det_t into MKDEV macro
Zdenek Kabelac
zkabelac at sourceware.org
Mon Nov 5 16:27:36 UTC 2018
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=aa8b2d6a0feb91bb5ea4364cdc53a00dfa233dca
Commit: aa8b2d6a0feb91bb5ea4364cdc53a00dfa233dca
Parent: d3ebb18f4052fd90bb2d177089e79801b51f6242
Author: Zdenek Kabelac <zkabelac at redhat.com>
AuthorDate: Sat Nov 3 17:13:10 2018 +0100
Committer: Zdenek Kabelac <zkabelac at redhat.com>
CommitterDate: Mon Nov 5 17:25:11 2018 +0100
cleanup: move cast to det_t into MKDEV macro
---
device_mapper/ioctl/libdm-iface.c | 8 ++++----
device_mapper/libdm-common.c | 2 +-
device_mapper/libdm-deptree.c | 4 ++--
device_mapper/misc/kdev_t.h | 2 +-
lib/activate/dev_manager.c | 2 +-
lib/device/dev-cache.c | 4 ++--
lib/device/dev-type.c | 4 ++--
libdm/ioctl/libdm-iface.c | 8 ++++----
libdm/libdm-common.c | 2 +-
libdm/libdm-deptree.c | 4 ++--
libdm/misc/kdev_t.h | 2 +-
tools/pvscan.c | 4 ++--
12 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 733eece..27db622 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -32,7 +32,7 @@
#else
# define MAJOR(x) major((x))
# define MINOR(x) minor((x))
-# define MKDEV(x,y) makedev((x),(y))
+# define MKDEV(x,y) makedev(((dev_t)x),((dev_t)y))
#endif
#include "device_mapper/misc/dm-ioctl.h"
@@ -261,7 +261,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
return -1;
}
- if (major && buf.st_rdev != MKDEV((dev_t)major, (dev_t)minor)) {
+ if (major && buf.st_rdev != MKDEV(major, minor)) {
log_verbose("%s: Wrong device number: (%u, %u) instead of "
"(%u, %u)", control,
MAJOR(buf.st_mode), MINOR(buf.st_mode),
@@ -304,7 +304,7 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
(void) dm_prepare_selinux_context(control, S_IFCHR);
old_umask = umask(DM_CONTROL_NODE_UMASK);
if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
- MKDEV((dev_t)major, (dev_t)minor)) < 0) {
+ MKDEV(major, minor)) < 0) {
log_sys_error("mknod", control);
ret = 0;
}
@@ -1182,7 +1182,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
}
dmi->flags |= DM_PERSISTENT_DEV_FLAG;
- dmi->dev = MKDEV((dev_t)dmt->major, (dev_t)dmt->minor);
+ dmi->dev = MKDEV(dmt->major, dmt->minor);
}
/* Does driver support device number referencing? */
diff --git a/device_mapper/libdm-common.c b/device_mapper/libdm-common.c
index eec31d7..45dcb4c 100644
--- a/device_mapper/libdm-common.c
+++ b/device_mapper/libdm-common.c
@@ -1042,7 +1042,7 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
{
char path[PATH_MAX];
struct stat info;
- dev_t dev = MKDEV((dev_t)major, (dev_t)minor);
+ dev_t dev = MKDEV(major, minor);
mode_t old_mask;
if (!_build_dev_path(path, sizeof(path), dev_name))
diff --git a/device_mapper/libdm-deptree.c b/device_mapper/libdm-deptree.c
index 5c5f12f..16858b4 100644
--- a/device_mapper/libdm-deptree.c
+++ b/device_mapper/libdm-deptree.c
@@ -531,7 +531,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
dm_list_init(&node->activated);
dm_list_init(&node->props.segs);
- dev = MKDEV((dev_t)info->major, (dev_t)info->minor);
+ dev = MKDEV(info->major, info->minor);
if (!dm_hash_insert_binary(dtree->devs, (const char *) &dev,
sizeof(dev), node)) {
@@ -554,7 +554,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
static struct dm_tree_node *_find_dm_tree_node(struct dm_tree *dtree,
uint32_t major, uint32_t minor)
{
- dev_t dev = MKDEV((dev_t)major, (dev_t)minor);
+ dev_t dev = MKDEV(major, minor);
return dm_hash_lookup_binary(dtree->devs, (const char *) &dev,
sizeof(dev));
diff --git a/device_mapper/misc/kdev_t.h b/device_mapper/misc/kdev_t.h
index f88bb0a..12780d2 100644
--- a/device_mapper/misc/kdev_t.h
+++ b/device_mapper/misc/kdev_t.h
@@ -17,6 +17,6 @@
#define MAJOR(dev) ((dev & 0xfff00) >> 8)
#define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00))
-#define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+#define MKDEV(ma,mi) (((dev_t)mi & 0xff) | ((dev_t)ma << 8) | (((dev_t)mi & ~0xff) << 12))
#endif
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index aaf113f..15dec6f 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -374,7 +374,7 @@ static int _ignore_blocked_mirror_devices(struct device *dev,
if (!(tmp_dev = dev_create_file(buf, NULL, NULL, 0)))
goto_out;
- tmp_dev->dev = MKDEV((dev_t)sm->logs[0].major, (dev_t)sm->logs[0].minor);
+ tmp_dev->dev = MKDEV(sm->logs[0].major, sm->logs[0].minor);
if (device_is_usable(tmp_dev, (struct dev_usable_check_params)
{ .check_empty = 1,
.check_blocked = 1,
diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
index fa92031..fb48f1a 100644
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -479,7 +479,7 @@ static struct device *_get_device_for_sysfs_dev_name_using_devno(const char *dev
return NULL;
}
- devno = MKDEV((dev_t)major, (dev_t)minor);
+ devno = MKDEV(major, minor);
if (!(dev = (struct device *) btree_lookup(_cache.devices, (uint32_t) devno))) {
/*
* If we get here, it means the device is referenced in sysfs, but it's not yet in /dev.
@@ -947,7 +947,7 @@ static int _dev_cache_iterate_sysfs_for_index(const char *path)
continue;
}
- devno = MKDEV((dev_t)major, (dev_t)minor);
+ devno = MKDEV(major, minor);
if (!(dev = (struct device *) btree_lookup(_cache.devices, (uint32_t) devno)) &&
!(dev = (struct device *) btree_lookup(_cache.sysfs_only_devices, (uint32_t) devno))) {
if (!dm_device_get_name(major, minor, 1, devname, sizeof(devname)) ||
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index 0b7af1b..f2d193b 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -506,7 +506,7 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
*/
if ((parts = dt->dev_type_array[major].max_partitions) > 1) {
if ((residue = minor % parts)) {
- *result = MKDEV((dev_t)major, (dev_t)(minor - residue));
+ *result = MKDEV(major, (minor - residue));
ret = 2;
} else {
*result = dev->dev;
@@ -576,7 +576,7 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
path, buffer);
goto out;
}
- *result = MKDEV((dev_t)major, (dev_t)minor);
+ *result = MKDEV(major, minor);
ret = 2;
out:
if (fp && fclose(fp))
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index e775da7..6d87749 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -30,7 +30,7 @@
#else
# define MAJOR(x) major((x))
# define MINOR(x) minor((x))
-# define MKDEV(x,y) makedev((x),(y))
+# define MKDEV(x,y) makedev(((dev_t)x),((dev_t)y))
#endif
#include "libdm/misc/dm-ioctl.h"
@@ -259,7 +259,7 @@ static int _control_exists(const char *control, uint32_t major, uint32_t minor)
return -1;
}
- if (major && buf.st_rdev != MKDEV((dev_t)major, (dev_t)minor)) {
+ if (major && buf.st_rdev != MKDEV(major, minor)) {
log_verbose("%s: Wrong device number: (%u, %u) instead of "
"(%u, %u)", control,
MAJOR(buf.st_mode), MINOR(buf.st_mode),
@@ -302,7 +302,7 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
(void) dm_prepare_selinux_context(control, S_IFCHR);
old_umask = umask(DM_CONTROL_NODE_UMASK);
if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
- MKDEV((dev_t)major, (dev_t)minor)) < 0) {
+ MKDEV(major, minor)) < 0) {
log_sys_error("mknod", control);
ret = 0;
}
@@ -1194,7 +1194,7 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt, unsigned repeat_count)
}
dmi->flags |= DM_PERSISTENT_DEV_FLAG;
- dmi->dev = MKDEV((dev_t)dmt->major, (dev_t)dmt->minor);
+ dmi->dev = MKDEV(dmt->major, dmt->minor);
}
/* Does driver support device number referencing? */
diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index 5099f91..7d19f75 100644
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -1040,7 +1040,7 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
{
char path[PATH_MAX];
struct stat info;
- dev_t dev = MKDEV((dev_t)major, (dev_t)minor);
+ dev_t dev = MKDEV(major, minor);
mode_t old_mask;
if (!_build_dev_path(path, sizeof(path), dev_name))
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 3e602e2..3f95a0d 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -523,7 +523,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
dm_list_init(&node->activated);
dm_list_init(&node->props.segs);
- dev = MKDEV((dev_t)info->major, (dev_t)info->minor);
+ dev = MKDEV(info->major, info->minor);
if (!dm_hash_insert_binary(dtree->devs, (const char *) &dev,
sizeof(dev), node)) {
@@ -546,7 +546,7 @@ static struct dm_tree_node *_create_dm_tree_node(struct dm_tree *dtree,
static struct dm_tree_node *_find_dm_tree_node(struct dm_tree *dtree,
uint32_t major, uint32_t minor)
{
- dev_t dev = MKDEV((dev_t)major, (dev_t)minor);
+ dev_t dev = MKDEV(major, minor);
return dm_hash_lookup_binary(dtree->devs, (const char *) &dev,
sizeof(dev));
diff --git a/libdm/misc/kdev_t.h b/libdm/misc/kdev_t.h
index f88bb0a..12780d2 100644
--- a/libdm/misc/kdev_t.h
+++ b/libdm/misc/kdev_t.h
@@ -17,6 +17,6 @@
#define MAJOR(dev) ((dev & 0xfff00) >> 8)
#define MINOR(dev) ((dev & 0xff) | ((dev >> 12) & 0xfff00))
-#define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+#define MKDEV(ma,mi) (((dev_t)mi & 0xff) | ((dev_t)ma << 8) | (((dev_t)mi & ~0xff) << 12))
#endif
diff --git a/tools/pvscan.c b/tools/pvscan.c
index e3cd410..85b0e04 100644
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -692,7 +692,7 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)
log_warn("WARNING: Failed to parse major:minor from %s, skipping.", pv_name);
continue;
}
- devno = MKDEV((dev_t)major, (dev_t)minor);
+ devno = MKDEV(major, minor);
if (!(dev = dev_cache_get_by_devt(cmd, devno, cmd->lvmetad_filter))) {
log_debug("pvscan arg %d:%d not found.", major, minor);
@@ -748,7 +748,7 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)
if (major < 0 || minor < 0)
continue;
- devno = MKDEV((dev_t)major, (dev_t)minor);
+ devno = MKDEV(major, minor);
if (!(dev = dev_cache_get_by_devt(cmd, devno, cmd->lvmetad_filter))) {
log_debug("pvscan arg %d:%d not found.", major, minor);
More information about the lvm-devel
mailing list