git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
block
/
blk-ioc.c
diff --git
a/block/blk-ioc.c
b/block/blk-ioc.c
index
d4ed600
..
cbdabb0
100644
(file)
--- a/
block/blk-ioc.c
+++ b/
block/blk-ioc.c
@@
-66,22
+66,22
@@
static void cfq_exit(struct io_context *ioc)
}
/* Called by the exitting task */
}
/* Called by the exitting task */
-void exit_io_context(
void
)
+void exit_io_context(
struct task_struct *task
)
{
struct io_context *ioc;
{
struct io_context *ioc;
- task_lock(
current
);
- ioc =
current
->io_context;
-
current
->io_context = NULL;
- task_unlock(
current
);
+ task_lock(
task
);
+ ioc =
task
->io_context;
+
task
->io_context = NULL;
+ task_unlock(
task
);
if (atomic_dec_and_test(&ioc->nr_tasks)) {
if (ioc->aic && ioc->aic->exit)
ioc->aic->exit(ioc->aic);
cfq_exit(ioc);
if (atomic_dec_and_test(&ioc->nr_tasks)) {
if (ioc->aic && ioc->aic->exit)
ioc->aic->exit(ioc->aic);
cfq_exit(ioc);
- put_io_context(ioc);
}
}
+ put_io_context(ioc);
}
struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
}
struct io_context *alloc_io_context(gfp_t gfp_flags, int node)