]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
block-aio-batch-completion-for-bios-kiocbs-fix
authorAndrew Morton <akpm@linux-foundation.org>
Sun, 10 Mar 2013 10:55:45 +0000 (21:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 12 Mar 2013 03:57:45 +0000 (14:57 +1100)
fs/aio.c: In function 'kioctx_ring_put':
fs/aio.c:636: 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 5aaa559b203874f525fb7b9e2d8d7a99ac2ed760..b289b93ce326dcd297d702bd4814c3433c41c3c8 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -646,7 +646,7 @@ static inline unsigned kioctx_ring_put(struct kioctx *ctx, struct kiocb *req,
        ev_page = kmap_atomic(ctx->ring_pages[pos / AIO_EVENTS_PER_PAGE]);
        event = ev_page + pos % AIO_EVENTS_PER_PAGE;
 
-       event->obj      = (u64) req->ki_obj.user;
+       event->obj      = (u64)(unsigned long)req->ki_obj.user;
        event->data     = req->ki_user_data;
        event->res      = req->ki_res;
        event->res2     = req->ki_res2;