mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-13 11:51:32 +00:00
Merge branch 'cfq' into for-linus
This commit is contained in:
commit
07e4470805
File diff suppressed because it is too large
Load Diff
@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
|
||||
ret->nr_batch_requests = 0; /* because this is 0 */
|
||||
ret->aic = NULL;
|
||||
ret->cic_root.rb_node = NULL;
|
||||
ret->ioc_data = NULL;
|
||||
/* make sure set_task_ioprio() sees the settings above */
|
||||
smp_wmb();
|
||||
tsk->io_context = ret;
|
||||
|
@ -116,6 +116,7 @@ struct io_context {
|
||||
|
||||
struct as_io_context *aic;
|
||||
struct rb_root cic_root;
|
||||
void *ioc_data;
|
||||
};
|
||||
|
||||
void put_io_context(struct io_context *ioc);
|
||||
|
Loading…
Reference in New Issue
Block a user