projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix regression by 8c43ba62('filesetup: align layout buffer')
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index c4240d2a8c9bb457ee2c92c9d5a3375a27885795..5e8ea357deb82a308d1102f888d895171cfc9e3c 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-110,7
+110,7
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
{
int new_layout = 0, unlink_file = 0, flags;
unsigned long long left;
{
int new_layout = 0, unlink_file = 0, flags;
unsigned long long left;
- unsigned int bs;
+ unsigned int bs
, alloc_size = 0
;
char *b = NULL;
if (read_only) {
char *b = NULL;
if (read_only) {
@@
-204,7
+204,8
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
if (bs > left)
bs = left;
if (bs > left)
bs = left;
- b = fio_memalign(page_size, bs);
+ alloc_size = bs;
+ b = fio_memalign(page_size, alloc_size);
if (!b) {
td_verror(td, errno, "fio_memalign");
goto err;
if (!b) {
td_verror(td, errno, "fio_memalign");
goto err;
@@
-259,14
+260,14
@@
static int extend_file(struct thread_data *td, struct fio_file *f)
f->io_size = f->real_file_size;
}
f->io_size = f->real_file_size;
}
- fio_memfree(b,
bs
);
+ fio_memfree(b,
alloc_size
);
done:
return 0;
err:
close(f->fd);
f->fd = -1;
if (b)
done:
return 0;
err:
close(f->fd);
f->fd = -1;
if (b)
- fio_memfree(b,
bs
);
+ fio_memfree(b,
alloc_size
);
return 1;
}
return 1;
}