projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
options: mark steadystate option parents
[fio.git]
/
diskutil.c
diff --git
a/diskutil.c
b/diskutil.c
index 294d2d3d084a371fb3b1b47a4fb2087046d9f262..27ddb46b7fecdae75114874210ed2ae135d21bd6 100644
(file)
--- a/
diskutil.c
+++ b/
diskutil.c
@@
-179,6
+179,7
@@
static int get_device_numbers(char *file_name, int *maj, int *min)
/*
* must be a file, open "." in that path
*/
/*
* must be a file, open "." in that path
*/
+ tempname[PATH_MAX - 1] = '\0';
strncpy(tempname, file_name, PATH_MAX - 1);
p = dirname(tempname);
if (stat(p, &st)) {
strncpy(tempname, file_name, PATH_MAX - 1);
p = dirname(tempname);
if (stat(p, &st)) {
@@
-291,10
+292,8
@@
static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = smalloc(sizeof(*du));
dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
du = smalloc(sizeof(*du));
- if (!du) {
- log_err("fio: smalloc() pool exhausted\n");
+ if (!du)
return NULL;
return NULL;
- }
memset(du, 0, sizeof(*du));
INIT_FLIST_HEAD(&du->list);
memset(du, 0, sizeof(*du));
INIT_FLIST_HEAD(&du->list);
@@
-426,6
+425,7
@@
static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
log_err("unknown sysfs layout\n");
return NULL;
}
log_err("unknown sysfs layout\n");
return NULL;
}
+ tmp[PATH_MAX - 1] = '\0';
strncpy(tmp, p, PATH_MAX - 1);
sprintf(path, "%s", tmp);
}
strncpy(tmp, p, PATH_MAX - 1);
sprintf(path, "%s", tmp);
}
@@
-489,7
+489,7
@@
void init_disk_util(struct thread_data *td)
unsigned int i;
if (!td->o.do_disk_util ||
unsigned int i;
if (!td->o.do_disk_util ||
-
(td->io_ops->flags & (FIO_DISKLESSIO | FIO_NODISKUTIL)
))
+
td_ioengine_flagged(td, FIO_DISKLESSIO | FIO_NODISKUTIL
))
return;
for_each_file(td, f, i)
return;
for_each_file(td, f, i)