diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2007-10-18 03:04:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:20 -0700 |
| commit | 6212e3a388fdda3f19fa660ef5a30edf54d1dcfd (patch) | |
| tree | 7218bbf29af36ff0c36aa2af8323a5206ea44b1c /include/linux | |
| parent | 9cd9a0058dd35268b24fa16795a92c800f4086d4 (diff) | |
| download | op-kernel-dev-6212e3a388fdda3f19fa660ef5a30edf54d1dcfd.zip op-kernel-dev-6212e3a388fdda3f19fa660ef5a30edf54d1dcfd.tar.gz | |
Remove struct task_struct::io_wait
Hell knows what happened in commit 63b05203af57e7de4f3bb63b8b81d43bc196d32b
during 2.6.9 development. Commit introduced io_wait field which remained
write-only than and still remains write-only.
Also garbage collect macros which "use" io_wait.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/aio.h | 12 | ||||
| -rw-r--r-- | include/linux/sched.h | 7 |
2 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index d10e608..7ef8de6 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -232,18 +232,6 @@ int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, __put_ioctx(kioctx); \ } while (0) -#define in_aio() (unlikely(!is_sync_wait(current->io_wait))) - -/* may be used for debugging */ -#define warn_if_async() \ -do { \ - if (in_aio()) { \ - printk(KERN_ERR "%s(%s:%d) called in async context!\n", \ - __FUNCTION__, __FILE__, __LINE__); \ - dump_stack(); \ - } \ -} while (0) - #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait) #include <linux/aio_abi.h> diff --git a/include/linux/sched.h b/include/linux/sched.h index c204ab0..269b234 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1110,13 +1110,6 @@ struct task_struct { unsigned long ptrace_message; siginfo_t *last_siginfo; /* For ptrace use. */ -/* - * current io wait handle: wait queue entry to use for io waits - * If this thread is processing aio, this points at the waitqueue - * inside the currently handled kiocb. It may be NULL (i.e. default - * to a stack based synchronous wait) if its doing sync IO. - */ - wait_queue_t *io_wait; #ifdef CONFIG_TASK_XACCT /* i/o counters(bytes read/written, #syscalls */ u64 rchar, wchar, syscr, syscw; |
