summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-03-02 15:25:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-03-07 14:27:03 +1100
commitd30caa1ac5a19a35e86db1a700d6e934eb9e70f2 (patch)
tree24cf62b75c66452e6aecee86fd3ab75accbb2610 /fs
parenta9af4b2ab34b8a4e05c99a3eecbd5dee26aa124c (diff)
aio-kiocb_cancel-fix
i386: fs/aio.c: In function 'kiocb_cancel': fs/aio.c:233: warning: cast from pointer to integer of different size Cc: Kent Overstreet <koverstreet@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/aio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index f7d9a0163d80..601c79018244 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -233,7 +233,7 @@ static int kiocb_cancel(struct kioctx *ctx, struct kiocb *kiocb,
spin_unlock_irq(&ctx->ctx_lock);
memset(res, 0, sizeof(*res));
- res->obj = (u64) kiocb->ki_obj.user;
+ res->obj = (u64)(unsigned long)kiocb->ki_obj.user;
res->data = kiocb->ki_user_data;
ret = cancel(kiocb, res);