summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-02-07 12:32:14 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-07 16:39:57 +1100
commitfb6d865dcab2874e8d3723be41ceb15b81c186cc (patch)
tree511af457a32ea63c465d6ebfe0c2415247450439
parent2bfcb632b1febd2f3d04a498d4c115146ed3d4ca (diff)
block-aio-batch-completion-for-bios-kiocbs-fix
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>
-rw-r--r--fs/aio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 0d4090738531..bdf251268e05 100644
--- 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;