This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / aio.h

diff --git a/include/linux/aio.h b/include/linux/aio.h
index 461a3b0..93fe788 100644 (file)
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -23,6 +23,8 @@ struct kioctx;
 
 #define KIOCB_SYNC_KEY         (~0U)
 
+#define KIOCB_PRIVATE_SIZE     (24 * sizeof(long))
+
 /* ki_flags bits */
 #define KIF_LOCKED             0
 #define KIF_KICKED             1
@@ -53,7 +55,6 @@ struct kiocb {
        struct kioctx           *ki_ctx;        /* may be NULL for sync ops */
        int                     (*ki_cancel)(struct kiocb *, struct io_event *);
        long                    (*ki_retry)(struct kiocb *);
-       void                    (*ki_dtor)(struct kiocb *);
 
        struct list_head        ki_list;        /* the aio core uses this
                                                 * for cancellation */
@@ -64,7 +65,8 @@ struct kiocb {
        } ki_obj;
        __u64                   ki_user_data;   /* user's data for completion */
        loff_t                  ki_pos;
-       void                    *private;
+
+       char                    private[KIOCB_PRIVATE_SIZE];
 };
 
 #define is_sync_kiocb(iocb)    ((iocb)->ki_key == KIOCB_SYNC_KEY)
@@ -77,7 +79,6 @@ struct kiocb {
                (x)->ki_filp = (filp);                  \
                (x)->ki_ctx = &tsk->active_mm->default_kioctx;  \
                (x)->ki_cancel = NULL;                  \
-               (x)->ki_dtor = NULL;                    \
                (x)->ki_obj.tsk = tsk;                  \
        } while (0)