X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Flinux%2Faio.h;h=b903fc02bdb7dbc5f95a041dbba4dab24bb67e7c;hb=b91cba52e9b7b3f1c0037908a192d93a869ca9e5;hp=a30ef13c9e622c91bfd7706955758e5932fc639e;hpb=e61c90188b9956edae1105eef361d8981a352fcd;p=linux-2.6-omap-h63xx.git

diff --git a/include/linux/aio.h b/include/linux/aio.h
index a30ef13c9e6..b903fc02bdb 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -119,6 +119,12 @@ struct kiocb {
 
 	struct list_head	ki_list;	/* the aio core uses this
 						 * for cancellation */
+
+	/*
+	 * If the aio_resfd field of the userspace iocb is not zero,
+	 * this is the underlying file* to deliver event to.
+	 */
+	struct file		*ki_eventfd;
 };
 
 #define is_sync_kiocb(iocb)	((iocb)->ki_key == KIOCB_SYNC_KEY)
@@ -226,7 +232,8 @@ int FASTCALL(io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
 		__put_ioctx(kioctx);					\
 } while (0)
 
-#define in_aio() !is_sync_wait(current->io_wait)
+#define in_aio() (unlikely(!is_sync_wait(current->io_wait)))
+
 /* may be used for debugging */
 #define warn_if_async()							\
 do {									\