projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/ime: various code and style cleanups
[fio.git]
/
engines
/
rbd.c
diff --git
a/engines/rbd.c
b/engines/rbd.c
index 8e7bd87c64d6bc251856ef9ec162f3c1097dbb73..081b4a040f6425c1f0dad7c8884d7f163c87fad6 100644
(file)
--- a/
engines/rbd.c
+++ b/
engines/rbd.c
@@
-9,9
+9,6
@@
#include "../fio.h"
#include "../optgroup.h"
#include "../fio.h"
#include "../optgroup.h"
-#ifdef CONFIG_RBD_BLKIN
-#include <zipkin_c.h>
-#endif
#ifdef CONFIG_RBD_POLL
/* add for poll */
#ifdef CONFIG_RBD_POLL
/* add for poll */
@@
-24,9
+21,6
@@
struct fio_rbd_iou {
rbd_completion_t completion;
int io_seen;
int io_complete;
rbd_completion_t completion;
int io_seen;
int io_complete;
-#ifdef CONFIG_RBD_BLKIN
- struct blkin_trace_info info;
-#endif
};
struct rbd_data {
};
struct rbd_data {
@@
-468,7
+462,8
@@
static int fio_rbd_getevents(struct thread_data *td, unsigned int min,
return events;
}
return events;
}
-static int fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_rbd_queue(struct thread_data *td,
+ struct io_u *io_u)
{
struct rbd_data *rbd = td->io_ops_data;
struct fio_rbd_iou *fri = io_u->engine_data;
{
struct rbd_data *rbd = td->io_ops_data;
struct fio_rbd_iou *fri = io_u->engine_data;
@@
-487,28
+482,16
@@
static int fio_rbd_queue(struct thread_data *td, struct io_u *io_u)
}
if (io_u->ddir == DDIR_WRITE) {
}
if (io_u->ddir == DDIR_WRITE) {
-#ifdef CONFIG_RBD_BLKIN
- blkin_init_trace_info(&fri->info);
- r = rbd_aio_write_traced(rbd->image, io_u->offset, io_u->xfer_buflen,
- io_u->xfer_buf, fri->completion, &fri->info);
-#else
r = rbd_aio_write(rbd->image, io_u->offset, io_u->xfer_buflen,
io_u->xfer_buf, fri->completion);
r = rbd_aio_write(rbd->image, io_u->offset, io_u->xfer_buflen,
io_u->xfer_buf, fri->completion);
-#endif
if (r < 0) {
log_err("rbd_aio_write failed.\n");
goto failed_comp;
}
} else if (io_u->ddir == DDIR_READ) {
if (r < 0) {
log_err("rbd_aio_write failed.\n");
goto failed_comp;
}
} else if (io_u->ddir == DDIR_READ) {
-#ifdef CONFIG_RBD_BLKIN
- blkin_init_trace_info(&fri->info);
- r = rbd_aio_read_traced(rbd->image, io_u->offset, io_u->xfer_buflen,
- io_u->xfer_buf, fri->completion, &fri->info);
-#else
r = rbd_aio_read(rbd->image, io_u->offset, io_u->xfer_buflen,
io_u->xfer_buf, fri->completion);
r = rbd_aio_read(rbd->image, io_u->offset, io_u->xfer_buflen,
io_u->xfer_buf, fri->completion);
-#endif
if (r < 0) {
log_err("rbd_aio_read failed.\n");
if (r < 0) {
log_err("rbd_aio_read failed.\n");