X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.c;h=feb88526bbb90af4d67fbcec8b038c2305328ec2;hp=e4b4b8a57830f8c1661672be0fd613e1b9dd40fd;hb=832fde7966f885a0c975a243596bc5b38a23c38e;hpb=f1d64553c9dc0e99c038cf3a5f0cb2a50026e7d3 diff --git a/diskutil.c b/diskutil.c index e4b4b8a5..feb88526 100644 --- a/diskutil.c +++ b/diskutil.c @@ -31,7 +31,7 @@ static void disk_util_free(struct disk_util *du) flist_del(&slave->slavelist); slave->users--; } - + fio_mutex_remove(du->lock); sfree(du); } @@ -215,7 +215,7 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, !strcmp(dirent->d_name, "..")) continue; - sprintf(temppath, "%s/%s", slavesdir, dirent->d_name); + sprintf(temppath, "%s%s%s", slavesdir, FIO_OS_PATH_SEPARATOR, dirent->d_name); /* Can we always assume that the slaves device entries * are links to the real directories for the slave * devices? @@ -240,7 +240,7 @@ static void find_add_disk_slaves(struct thread_data *td, char *path, if (slavedu) continue; - sprintf(temppath, "%s/%s", slavesdir, slavepath); + sprintf(temppath, "%s%s%s", slavesdir, FIO_OS_PATH_SEPARATOR, slavepath); __init_per_file_disk_util(td, majdev, mindev, temppath); slavedu = disk_util_exists(majdev, mindev); @@ -327,7 +327,7 @@ static int find_block_dir(int majdev, int mindev, char *path, int link_ok) if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) continue; - sprintf(full_path, "%s/%s", path, dir->d_name); + sprintf(full_path, "%s%s%s", path, FIO_OS_PATH_SEPARATOR, dir->d_name); if (!strcmp(dir->d_name, "dev")) { if (!check_dev_match(majdev, mindev, full_path)) {