mirror of
https://github.com/schoebel/mars
synced 2025-01-14 02:50:48 +00:00
aio: remove obsolete wait_during_fdsync
This commit is contained in:
parent
db06f20a05
commit
9692a33f33
16
mars_aio.c
16
mars_aio.c
@ -1030,22 +1030,6 @@ static int aio_submit_thread(void *data)
|
||||
|
||||
sleeptime = 1;
|
||||
for (;;) {
|
||||
/* This is just a test. Don't enable it for performance reasons.
|
||||
*/
|
||||
if (output->brick->wait_during_fdsync && mref->ref_rw != READ) {
|
||||
if (output->fdsync_active) {
|
||||
long long delay = 60 * HZ;
|
||||
atomic_inc(&output->total_fdsync_wait_count);
|
||||
__wait_event_interruptible_timeout(
|
||||
output->fdsync_event,
|
||||
!output->fdsync_active,
|
||||
delay);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Now really do the work
|
||||
*/
|
||||
status = aio_submit(output, mref_a, false);
|
||||
|
||||
if (likely(status != -EAGAIN)) {
|
||||
|
@ -48,7 +48,6 @@ struct aio_brick {
|
||||
bool o_creat;
|
||||
bool o_direct;
|
||||
bool o_fdsync;
|
||||
bool wait_during_fdsync;
|
||||
};
|
||||
|
||||
struct aio_input {
|
||||
|
@ -238,7 +238,6 @@ int _set_server_aio_params(struct mars_brick *_brick, void *private)
|
||||
aio_brick->o_creat = false;
|
||||
aio_brick->o_direct = false;
|
||||
aio_brick->o_fdsync = false;
|
||||
aio_brick->wait_during_fdsync = false;
|
||||
MARS_INF("name = '%s' path = '%s'\n", _brick->brick_name, _brick->brick_path);
|
||||
return 1;
|
||||
}
|
||||
|
@ -151,8 +151,6 @@ EXPORT_SYMBOL_GPL(mars_mem_percent);
|
||||
#define BIO_SYNC true
|
||||
#define BIO_UNPLUG true
|
||||
|
||||
#define AIO_WAIT_DURING_FDSYNC false
|
||||
|
||||
#define COPY_APPEND_MODE 0
|
||||
//#define COPY_APPEND_MODE 1 // FIXME: does not work yet
|
||||
#define COPY_PRIO MARS_PRIO_LOW
|
||||
@ -252,7 +250,6 @@ int _set_aio_params(struct mars_brick *_brick, void *private)
|
||||
aio_brick->o_creat = clc && clc->create_mode;
|
||||
aio_brick->o_direct = false; // important!
|
||||
aio_brick->o_fdsync = true;
|
||||
aio_brick->wait_during_fdsync = AIO_WAIT_DURING_FDSYNC;
|
||||
MARS_INF("name = '%s' path = '%s'\n", _brick->brick_name, _brick->brick_path);
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user