---

yaml --- r: 263169 b: refs/heads/master c: dccaf33 h: refs/heads/master i: 263167: b80f9c7 v: v3
git-mirror · Aug 19, 2011 · 49e7f8d · 49e7f8d
1 parent fdb2f5c
commit 49e7f8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dd75f1f1a02d656a11a7b9b9e6c2759b9c1e946
+refs/heads/master: dccaf33fa37a1bc5d651baeb3bfeb6becb86597b
diff --git a/trunk/fs/ext4/indirect.c b/trunk/fs/ext4/indirect.c
@@ -800,12 +800,17 @@ ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
 	}
 
 retry:
-	if (rw == READ && ext4_should_dioread_nolock(inode))
+	if (rw == READ && ext4_should_dioread_nolock(inode)) {
+		if (unlikely(!list_empty(&ei->i_completed_io_list))) {
+			mutex_lock(&inode->i_mutex);
+			ext4_flush_completed_IO(inode);
+			mutex_unlock(&inode->i_mutex);
+		}
 		ret = __blockdev_direct_IO(rw, iocb, inode,
 				 inode->i_sb->s_bdev, iov,
 				 offset, nr_segs,
 				 ext4_get_block, NULL, NULL, 0);
-	else {
+	} else {
 		ret = blockdev_direct_IO(rw, iocb, inode, iov,
 				 offset, nr_segs, ext4_get_block);