projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exp: get rid of the #line bug workaround
[fio.git]
/
engines
/
e4defrag.c
diff --git
a/engines/e4defrag.c
b/engines/e4defrag.c
index cc88493794351d06f6c9557c8ea18823934b8a41..3599ab8a49ce708087c4ac88b18b74bd728bec95 100644
(file)
--- a/
engines/e4defrag.c
+++ b/
engines/e4defrag.c
@@
-47,6
+47,8
@@
static struct fio_option options[] = {
.type = FIO_OPT_STR_STORE,
.off1 = offsetof(struct e4defrag_options, donor_name),
.help = "File used as a block donor",
.type = FIO_OPT_STR_STORE,
.off1 = offsetof(struct e4defrag_options, donor_name),
.help = "File used as a block donor",
+ .category = FIO_OPT_C_ENGINE,
+ .group = FIO_OPT_G_E4DEFRAG,
},
{
.name = "inplace",
},
{
.name = "inplace",
@@
-55,6
+57,8
@@
static struct fio_option options[] = {
.minval = 0,
.maxval = 1,
.help = "Alloc and free space inside defrag event",
.minval = 0,
.maxval = 1,
.help = "Alloc and free space inside defrag event",
+ .category = FIO_OPT_C_ENGINE,
+ .group = FIO_OPT_G_E4DEFRAG,
},
{
.name = NULL,
},
{
.name = NULL,
@@
-76,7
+80,7
@@
static int fio_e4defrag_init(struct thread_data *td)
ed = malloc(sizeof(*ed));
if (!ed) {
ed = malloc(sizeof(*ed));
if (!ed) {
- td_verror(td,
-
ENOMEM, "io_queue_init");
+ td_verror(td, ENOMEM, "io_queue_init");
return 1;
}
memset(ed, 0 ,sizeof(*ed));
return 1;
}
memset(ed, 0 ,sizeof(*ed));
@@
-87,8
+91,8
@@
static int fio_e4defrag_init(struct thread_data *td)
ed->donor_fd = open(donor_name, O_CREAT|O_WRONLY, 0644);
if (ed->donor_fd < 0) {
ed->donor_fd = open(donor_name, O_CREAT|O_WRONLY, 0644);
if (ed->donor_fd < 0) {
- td_verror(td, e
d->donor_fd
, "io_queue_init");
- log_err("Can't open donor file %s err:%d", ed->donor_fd);
+ td_verror(td, e
rrno
, "io_queue_init");
+ log_err("Can't open donor file %s err:%d",
donor_name,
ed->donor_fd);
free(ed);
return 1;
}
free(ed);
return 1;
}
@@
-161,9
+165,6
@@
static int fio_e4defrag_queue(struct thread_data *td, struct io_u *io_u)
ret = ioctl(f->fd, EXT4_IOC_MOVE_EXT, &me);
len = me.moved_len * ed->bsz;
ret = ioctl(f->fd, EXT4_IOC_MOVE_EXT, &me);
len = me.moved_len * ed->bsz;
- if (io_u->file && len >= 0 && ddir_rw(io_u->ddir))
- io_u->file->file_pos = io_u->offset + len;
-
if (len > io_u->xfer_buflen)
len = io_u->xfer_buflen;
if (len > io_u->xfer_buflen)
len = io_u->xfer_buflen;