Skip to content

Commit

Permalink
[PATCH] exit_io_context: don't disable irqs
Browse files Browse the repository at this point in the history
We don't need to disable irqs to clear current->io_context, it is protected
by ->alloc_lock. Even IF it was possible to submit I/O from IRQ on behalf of
current this irq_disable() can't help: current_io_context() will re-instantiate
->io_context after irq_enable().

We don't need task_lock() or local_irq_disable() to clear ioc->task. This can't
prevent other CPUs from playing with our io_context anyway.

Signed-off-by: Oleg Nesterov <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
Oleg Nesterov authored and Jens Axboe committed Sep 30, 2006
1 parent 9bf09c2 commit 25034d7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions block/ll_rw_blk.c
Original file line number Diff line number Diff line change
Expand Up @@ -3629,25 +3629,22 @@ EXPORT_SYMBOL(put_io_context);
/* Called by the exitting task */
void exit_io_context(void)
{
unsigned long flags;
struct io_context *ioc;
struct cfq_io_context *cic;

local_irq_save(flags);
task_lock(current);
ioc = current->io_context;
current->io_context = NULL;
ioc->task = NULL;
task_unlock(current);
local_irq_restore(flags);

ioc->task = NULL;
if (ioc->aic && ioc->aic->exit)
ioc->aic->exit(ioc->aic);
if (ioc->cic_root.rb_node != NULL) {
cic = rb_entry(rb_first(&ioc->cic_root), struct cfq_io_context, rb_node);
cic->exit(ioc);
}

put_io_context(ioc);
}

Expand Down

0 comments on commit 25034d7

Please sign in to comment.