2 files changed, 3 insertions, 2 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 1d55e7e67342..0d06097bc995 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -215,7 +215,7 @@ static struct page *dio_get_page(struct dio *dio)
 static void dio_complete(struct dio *dio, loff_t offset, ssize_t bytes)
 {
         if (dio->end_io && dio->result)
-                dio->end_io(dio->inode, offset, bytes, dio->map_bh.b_private);
+                dio->end_io(dio->iocb, offset, bytes, dio->map_bh.b_private);
         if (dio->lock_type == DIO_LOCKING)
                 up_read(&dio->inode->i_alloc_sem);
 }
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 93ce257cd149..a3a4b5aaf5d9 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -149,11 +149,12 @@ linvfs_unwritten_convert(
  */
 STATIC void
 linvfs_unwritten_convert_direct(
-        struct inode    *inode,
+        struct kiocb    *iocb,
         loff_t          offset,
         ssize_t         size,
         void            *private)
 {
+        struct inode    *inode = iocb->ki_filp->f_dentry->d_inode;
         ASSERT(!private || inode == (struct inode *)private);
 
         /* private indicates an unwritten extent lay beneath this IO */