Not sure how that was done, but I missed binject in doing
the ->file_data/->file_pos unification.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
one_more:
events = 0;
for_each_file(td, f, i) {
one_more:
events = 0;
for_each_file(td, f, i) {
+ bf = (void *) f->engine_data;
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
if (ret < 0) {
if (errno == EAGAIN)
* Fill in the file descriptors
*/
for_each_file(td, f, i) {
* Fill in the file descriptors
*/
for_each_file(td, f, i) {
+ bf = (void *) f->engine_data;
/*
* don't block for min events == 0
/*
* don't block for min events == 0
if (!min) {
for_each_file(td, f, i) {
if (!min) {
for_each_file(td, f, i) {
+ bf = (void *) f->engine_data;
fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
}
}
fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
}
}
static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
{
struct b_user_cmd *buc = &io_u->buc;
static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
{
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf = io_u->file->file_data;
+ struct binject_file *bf = (void *) io_u->file->engine_data;
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
int ret;
ret = write(bf->fd, buc, sizeof(*buc));
{
struct binject_data *bd = td->io_ops->data;
struct b_user_cmd *buc = &io_u->buc;
{
struct binject_data *bd = td->io_ops->data;
struct b_user_cmd *buc = &io_u->buc;
- struct binject_file *bf = io_u->file->file_data;
+ struct binject_file *bf = (void *) io_u->file->engine_data;
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
if (io_u->xfer_buflen & (bf->bs - 1)) {
log_err("read/write not sector aligned\n");
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
{
- struct binject_file *bf = f->file_data;
+ struct binject_file *bf = (void *) f->engine_data;
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
if (bf) {
binject_unmap_dev(td, bf);
free(bf);
return generic_close_file(td, f);
}
return generic_close_file(td, f);
}
bf = malloc(sizeof(*bf));
bf->bs = bs;
bf->minor = bf->fd = -1;
bf = malloc(sizeof(*bf));
bf->bs = bs;
bf->minor = bf->fd = -1;
+ f->engine_data = (uint64_t) bf;
if (binject_map_dev(td, bf, f->fd)) {
err_close:
if (binject_map_dev(td, bf, f->fd)) {
err_close: