diff options
author | Steve French <sfrench@us.ibm.com> | 2008-03-01 18:29:55 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 18:29:55 +0000 |
commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /include/linux/aio.h | |
parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
download | kernel-crypto-0dbd888936a23514716b8d944775bc56f731363a.tar.gz kernel-crypto-0dbd888936a23514716b8d944775bc56f731363a.tar.xz kernel-crypto-0dbd888936a23514716b8d944775bc56f731363a.zip |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/aio.h')
-rw-r--r-- | include/linux/aio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index a9931e2e562..0d0b7f629bd 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h @@ -105,7 +105,6 @@ struct kiocb { wait_queue_t ki_wait; loff_t ki_pos; - atomic_t ki_bio_count; /* num bio used for this iocb */ void *private; /* State that we remember to be able to restart/retry */ unsigned short ki_opcode; |