diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
commit | 28af493cd7b89cba7e3ee534079cf4f41bb4b4f9 (patch) | |
tree | ea27df5ab7b728496a15602e0a7da74ff188378f /include/linux/aio.h | |
parent | 74cfe03f80adc320bde4dd37616354aefe2271aa (diff) | |
parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) |
Merge branch 'master'
Diffstat (limited to 'include/linux/aio.h')
-rw-r--r-- | include/linux/aio.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/aio.h b/include/linux/aio.h index 60def658b246..0decf66117c1 100644 --- a/include/linux/aio.h +++ b/include/linux/aio.h | |||
@@ -24,7 +24,12 @@ struct kioctx; | |||
24 | #define KIOCB_SYNC_KEY (~0U) | 24 | #define KIOCB_SYNC_KEY (~0U) |
25 | 25 | ||
26 | /* ki_flags bits */ | 26 | /* ki_flags bits */ |
27 | #define KIF_LOCKED 0 | 27 | /* |
28 | * This may be used for cancel/retry serialization in the future, but | ||
29 | * for now it's unused and we probably don't want modules to even | ||
30 | * think they can use it. | ||
31 | */ | ||
32 | /* #define KIF_LOCKED 0 */ | ||
28 | #define KIF_KICKED 1 | 33 | #define KIF_KICKED 1 |
29 | #define KIF_CANCELLED 2 | 34 | #define KIF_CANCELLED 2 |
30 | 35 | ||