summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Viro <viro@parcelfarce.linux.theplanet.co.uk>2004-05-29 02:17:49 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-29 02:17:49 -0700
commit83e3aab95b1c99c64e88e4755f1cf7d2fef2a9c6 (patch)
treefe4a3fcad61563c4696e74f1b8ceff510f0c99e2
parent990e08a346ad708258dbad85e85236fa75443604 (diff)
[PATCH] sparse: aio annotation
-rw-r--r--fs/aio.c4
-rw-r--r--include/linux/aio.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 85c208cc2619..574eeaf5d490 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -934,7 +934,7 @@ static void io_destroy(struct kioctx *ioctx)
* pointer is passed for ctxp. Will fail with -ENOSYS if not
* implemented.
*/
-asmlinkage long sys_io_setup(unsigned nr_events, aio_context_t *ctxp)
+asmlinkage long sys_io_setup(unsigned nr_events, aio_context_t __user *ctxp)
{
struct kioctx *ioctx = NULL;
unsigned long ctx;
@@ -1094,7 +1094,7 @@ out_put_req:
* fail with -ENOSYS if not implemented.
*/
asmlinkage long sys_io_submit(aio_context_t ctx_id, long nr,
- struct iocb __user **iocbpp)
+ struct iocb __user * __user *iocbpp)
{
struct kioctx *ctx;
long ret = 0;
diff --git a/include/linux/aio.h b/include/linux/aio.h
index b03ebead268c..6e88c87c901e 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -149,11 +149,11 @@ struct mm_struct;
extern void FASTCALL(exit_aio(struct mm_struct *mm));
extern struct kioctx *lookup_ioctx(unsigned long ctx_id);
extern int FASTCALL(io_submit_one(struct kioctx *ctx,
- struct iocb *user_iocb, struct iocb *iocb));
+ struct iocb __user *user_iocb, struct iocb *iocb));
/* semi private, but used by the 32bit emulations: */
struct kioctx *lookup_ioctx(unsigned long ctx_id);
-int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb *user_iocb,
+int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
struct iocb *iocb));
#define get_ioctx(kioctx) do { if (unlikely(atomic_read(&(kioctx)->users) <= 0)) BUG(); atomic_inc(&(kioctx)->users); } while (0)