projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve zone support documentation
[fio.git]
/
filesetup.c
diff --git
a/filesetup.c
b/filesetup.c
index 75694bd81825082516d9f1601de08a650ebe9aa1..94a025e6c1064e442dc18254d08e3f002dcae644 100644
(file)
--- a/
filesetup.c
+++ b/
filesetup.c
@@
-107,7
+107,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
long long
bs;
char *b = NULL;
if (read_only) {
char *b = NULL;
if (read_only) {
@@
-260,7
+260,7
@@
static bool pre_read_file(struct thread_data *td, struct fio_file *f)
{
int r, did_open = 0, old_runstate;
unsigned long long left;
{
int r, did_open = 0, old_runstate;
unsigned long long left;
- unsigned
int
bs;
+ unsigned
long long
bs;
bool ret = true;
char *b;
bool ret = true;
char *b;
@@
-674,7
+674,8
@@
open_again:
from_hash = file_lookup_open(f, flags);
} else if (td_trim(td)) {
assert(!td_rw(td)); /* should have matched above */
from_hash = file_lookup_open(f, flags);
} else if (td_trim(td)) {
assert(!td_rw(td)); /* should have matched above */
- flags |= O_RDWR;
+ if (!read_only)
+ flags |= O_RDWR;
from_hash = file_lookup_open(f, flags);
}
from_hash = file_lookup_open(f, flags);
}
@@
-899,7
+900,7
@@
int setup_files(struct thread_data *td)
unsigned int i, nr_fs_extra = 0;
int err = 0, need_extend;
int old_state;
unsigned int i, nr_fs_extra = 0;
int err = 0, need_extend;
int old_state;
- const unsigned
int
bs = td_min_bs(td);
+ const unsigned
long long
bs = td_min_bs(td);
uint64_t fs = 0;
dprint(FD_FILE, "setup files\n");
uint64_t fs = 0;
dprint(FD_FILE, "setup files\n");
@@
-1674,6
+1675,11
@@
int put_file(struct thread_data *td, struct fio_file *f)
if (--f->references)
return 0;
if (--f->references)
return 0;
+ disk_util_dec(f->du);
+
+ if (td->o.file_lock_mode != FILE_LOCK_NONE)
+ unlock_file_all(td, f);
+
if (should_fsync(td) && td->o.fsync_on_close) {
f_ret = fsync(f->fd);
if (f_ret < 0)
if (should_fsync(td) && td->o.fsync_on_close) {
f_ret = fsync(f->fd);
if (f_ret < 0)
@@
-1687,6
+1693,7
@@
int put_file(struct thread_data *td, struct fio_file *f)
ret = f_ret;
td->nr_open_files--;
ret = f_ret;
td->nr_open_files--;
+ fio_file_clear_closing(f);
fio_file_clear_open(f);
assert(f->fd == -1);
return ret;
fio_file_clear_open(f);
assert(f->fd == -1);
return ret;