---

yaml --- r: 185875 b: refs/heads/master c: b7adc1f h: refs/heads/master i: 185873: e3a0beb 185871: 2f9149b v: v3
git-mirror · Mar 2, 2010 · e967626 · e967626
1 parent 560da98
commit e967626
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 744692dc059845b2a3022119871846e74d4f6e11
+refs/heads/master: b7adc1f363e72e9131a582cc2cb00eaf83f51a39
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
@@ -3474,7 +3474,14 @@ static ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
 	}
 
 retry:
-	ret = blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+	if (rw == READ && ext4_should_dioread_nolock(inode))
+		ret = blockdev_direct_IO_no_locking(rw, iocb, inode,
+				 inode->i_sb->s_bdev, iov,
+				 offset, nr_segs,
+				 ext4_get_block, NULL);
+	else
+		ret = blockdev_direct_IO(rw, iocb, inode,
+				 inode->i_sb->s_bdev, iov,
 				 offset, nr_segs,
 				 ext4_get_block, NULL);
 	if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))