projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Full readonly check
[fio.git]
/
engines
/
sg.c
diff --git
a/engines/sg.c
b/engines/sg.c
index 44e151b65ead24c0d7ffc6040369f74ad79b2fd6..790019e1d57fa48e7a635cecdc47dd5b6835cba3 100644
(file)
--- a/
engines/sg.c
+++ b/
engines/sg.c
@@
-12,7
+12,6
@@
#include <sys/poll.h>
#include "../fio.h"
#include <sys/poll.h>
#include "../fio.h"
-#include "../os.h"
#ifdef FIO_HAVE_SGIO
#ifdef FIO_HAVE_SGIO
@@
-65,15
+64,11
@@
static int pollin_events(struct pollfd *pfds, int fds)
static int fio_sgio_getevents(struct thread_data *td, int min, int max,
struct timespec fio_unused *t)
{
static int fio_sgio_getevents(struct thread_data *td, int min, int max,
struct timespec fio_unused *t)
{
- /*
- * normally hard coding &td->files[0] is a bug that needs to be fixed,
- * but it's ok here as all files should point to the same device.
- */
- struct fio_file *f = &td->files[0];
struct sgio_data *sd = td->io_ops->data;
int left = max, ret, r = 0;
void *buf = sd->sgbuf;
unsigned int i, events;
struct sgio_data *sd = td->io_ops->data;
int left = max, ret, r = 0;
void *buf = sd->sgbuf;
unsigned int i, events;
+ struct fio_file *f;
/*
* Fill in the file descriptors
/*
* Fill in the file descriptors
@@
-247,6
+242,8
@@
static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
struct sg_io_hdr *hdr = &io_u->hdr;
int ret;
struct sg_io_hdr *hdr = &io_u->hdr;
int ret;
+ fio_ro_check(td, io_u);
+
ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
if (ret < 0)
ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
if (ret < 0)
@@
-390,7
+387,7
@@
static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
if (ret)
return ret;
if (ret)
return ret;
- if (!sd->type_checked && fio_sgio_type_check(td, f)) {
+ if (
sd &&
!sd->type_checked && fio_sgio_type_check(td, f)) {
generic_close_file(td, f);
return 1;
}
generic_close_file(td, f);
return 1;
}