Makefile: Fix android compilation

[fio.git] / diskutil.c

diff --git a/diskutil.c b/diskutil.c
index 6c6380bbc774e7b4dca76f6882dac9008008538b..ace7af3d5b5bb7368584a1369a0872cbe79c92ee 100644 (file)
--- a/diskutil.c
+++ b/diskutil.c
@@ -166,14 +166,10 @@ static int get_device_numbers(char *file_name, int *maj, int *min)
                if (S_ISBLK(st.st_mode)) {
                        majdev = major(st.st_rdev);
                        mindev = minor(st.st_rdev);
-               } else if (S_ISCHR(st.st_mode)) {
-                       majdev = major(st.st_rdev);
-                       mindev = minor(st.st_rdev);
-                       if (fio_lookup_raw(st.st_rdev, &majdev, &mindev))
-                               return -1;
-               } else if (S_ISFIFO(st.st_mode))
+               } else if (S_ISCHR(st.st_mode) ||
+                          S_ISFIFO(st.st_mode)) {
                        return -1;
-               else {
+               } else {
                        majdev = major(st.st_dev);
                        mindev = minor(st.st_dev);
                }
@@ -181,7 +177,7 @@ static int get_device_numbers(char *file_name, int *maj, int *min)
                /*
                 * must be a file, open "." in that path
                 */
-               snprintf(tempname, ARRAY_SIZE(tempname), "%s", file_name);
+               snprintf(tempname, FIO_ARRAY_SIZE(tempname), "%s", file_name);
                p = dirname(tempname);
                if (stat(p, &st)) {
                        perror("disk util stat");
@@ -313,7 +309,7 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
                sfree(du);
                return NULL;
        }
-       snprintf((char *) du->dus.name, ARRAY_SIZE(du->dus.name), "%s",
+       snprintf((char *) du->dus.name, FIO_ARRAY_SIZE(du->dus.name), "%s",
                 basename(path));
        du->sysfs_root = strdup(path);
        du->major = majdev;
@@ -435,7 +431,7 @@ static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
                        log_err("unknown sysfs layout\n");
                        return NULL;
                }
-               snprintf(tmp, ARRAY_SIZE(tmp), "%s", p);
+               snprintf(tmp, FIO_ARRAY_SIZE(tmp), "%s", p);
                sprintf(path, "%s", tmp);
        }