projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ime-support' of https://github.com/DDNStorage/fio-public into ddn-ime
[fio.git]
/
ioengines.c
diff --git
a/ioengines.c
b/ioengines.c
index efefb0696e6cb14c70190c115fd81c2107d301ff..433da604ae4af03daf9fc8b8d5a81b2097ed0362 100644
(file)
--- a/
ioengines.c
+++ b/
ioengines.c
@@
-279,7
+279,7
@@
out:
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
{
const enum fio_ddir ddir = acct_ddir(io_u);
enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
{
const enum fio_ddir ddir = acct_ddir(io_u);
- unsigned long buflen = io_u->xfer_buflen;
+ unsigned long
long
buflen = io_u->xfer_buflen;
enum fio_q_status ret;
dprint_io_u(io_u, "queue");
enum fio_q_status ret;
dprint_io_u(io_u, "queue");
@@
-431,6
+431,14
@@
void td_io_commit(struct thread_data *td)
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
int td_io_open_file(struct thread_data *td, struct fio_file *f)
{
+ if (fio_file_closing(f)) {
+ /*
+ * Open translates to undo closing.
+ */
+ fio_file_clear_closing(f);
+ get_file(f);
+ return 0;
+ }
assert(!fio_file_open(f));
assert(f->fd == -1);
assert(td->io_ops->open_file);
assert(!fio_file_open(f));
assert(f->fd == -1);
assert(td->io_ops->open_file);
@@
-540,11
+548,6
@@
int td_io_close_file(struct thread_data *td, struct fio_file *f)
*/
fio_file_set_closing(f);
*/
fio_file_set_closing(f);
- disk_util_dec(f->du);
-
- if (td->o.file_lock_mode != FILE_LOCK_NONE)
- unlock_file_all(td, f);
-
return put_file(td, f);
}
return put_file(td, f);
}