Merge branch 'master' into gfs2

1 files changed, 8 insertions, 6 deletions

diff --git a/fs/xfs/linux-2.6/xfs_lrw.c b/fs/xfs/linux-2.6/xfs_lrw.c
index ee788b1cb364..fa842f1c9fa2 100644
--- a/fs/xfs/linux-2.6/xfs_lrw.c
+++ b/fs/xfs/linux-2.6/xfs_lrw.c
@@ -270,16 +270,18 @@ xfs_read(
                 }
         }
 
-        if (unlikely((ioflags & IO_ISDIRECT) && VN_CACHED(vp)))
-                bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
-                                                -1, FI_REMAPF_LOCKED);
-
-        if (unlikely(ioflags & IO_ISDIRECT))
+        if (unlikely(ioflags & IO_ISDIRECT)) {
+                if (VN_CACHED(vp))
+                        bhv_vop_flushinval_pages(vp, ctooff(offtoct(*offset)),
+                                                 -1, FI_REMAPF_LOCKED);
                 mutex_unlock(&inode->i_mutex);
+        }
 
         xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore,
                                 (void *)iovp, segs, *offset, ioflags);
-        ret = __generic_file_aio_read(iocb, iovp, segs, offset);
+
+        iocb->ki_pos = *offset;
+        ret = generic_file_aio_read(iocb, iovp, segs, *offset);
         if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO))
                 ret = wait_on_sync_kiocb(iocb);
         if (ret > 0)