From 5d5f0792db5634bfebdcc0dfef9db0f37fc7d9d8 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Tue, 29 Aug 2006 09:15:14 +0200 Subject: [PATCH] --- yaml --- r: 37566 b: refs/heads/master c: 25034d7a83cf77667f3d65822484b305d4be6b25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/ll_rw_blk.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6a7a4cc1859c..230632b7669e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bf09c23853bb8009625c2ec60dc6beb9472d3ca +refs/heads/master: 25034d7a83cf77667f3d65822484b305d4be6b25 diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c index 57992ae511c2..f757ed413214 100644 --- a/trunk/block/ll_rw_blk.c +++ b/trunk/block/ll_rw_blk.c @@ -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); }