diff options
| author | Andrew Morton <akpm@osdl.org> | 2003-07-04 19:37:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-04 19:37:19 -0700 |
| commit | 16f88dbdbffa3dc52b959706e6a311a932b51ed6 (patch) | |
| tree | 388bc4d9ad1e53f456d830fc8b5ac6145b7b51e6 /kernel | |
| parent | 80af89ca709d4dfe41178abe29217a0fefa1af12 (diff) | |
[PATCH] generic io contexts
From: Nick Piggin <piggin@cyberone.com.au>
Generalise the AS-specific per-process IO context so that other IO schedulers
could use it.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/exit.c | 4 | ||||
| -rw-r--r-- | kernel/fork.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 8471381546af..ebc839b645a7 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -682,8 +682,8 @@ NORET_TYPE void do_exit(long code) panic("Attempted to kill the idle task!"); if (unlikely(tsk->pid == 1)) panic("Attempted to kill init!"); - if (tsk->as_io_context) - exit_as_io_context(); + if (tsk->io_context) + exit_io_context(); tsk->flags |= PF_EXITING; del_timer_sync(&tsk->real_timer); diff --git a/kernel/fork.c b/kernel/fork.c index fcdc884cd894..96ce3385cc75 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -864,7 +864,7 @@ struct task_struct *copy_process(unsigned long clone_flags, p->lock_depth = -1; /* -1 = no lock */ p->start_time = get_jiffies_64(); p->security = NULL; - p->as_io_context = NULL; + p->io_context = NULL; retval = -ENOMEM; if ((retval = security_task_alloc(p))) |