]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
aio-kiocb_cancel-fix
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 20 Feb 2013 02:16:42 +0000 (13:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:54:03 +0000 (16:54 +1100)
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>
fs/aio.c

index 189e9f771877b8a05c9e486386d9fbe3c11bde63..5fe1b3ad5e8e8afd7704950e3883f08f025aca30 100644 (file)
--- 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);