From: Tilman Schmidt <tilman@imap.cc>

Cc: Suparna Bhattacharya <suparna@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/aio.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff -puN include/linux/aio.h~fsaio-enable-wait-bit-based-filtered-wakeups-to-work-for-aio-fix-sparse-fix include/linux/aio.h
--- a/include/linux/aio.h~fsaio-enable-wait-bit-based-filtered-wakeups-to-work-for-aio-fix-sparse-fix
+++ a/include/linux/aio.h
@@ -237,9 +237,14 @@ do {									\
 	}								\
 } while (0)
 
-#define io_wait_to_kiocb(io_wait) container_of(container_of(io_wait,	\
-	struct wait_bit_queue, wait), struct kiocb, ki_wait)
+static inline struct kiocb *io_wait_to_kiocb(wait_queue_t *io_wait)
+{
+	struct wait_bit_queue *wbqptr;
 
+	wbqptr = container_of(io_wait, struct wait_bit_queue, wait);
+	return container_of(wbqptr, struct kiocb, ki_wait);
+}
+
 #include <linux/aio_abi.h>
 
 static inline struct kiocb *list_kiocb(struct list_head *h)
_