2009-12-16 01:40:59

by Jiaying Zhang

[permalink] [raw]
Subject: [RFC PATCH 3/4] ext4: use direct_IO_no_locking in ext4 DIO read

ext4: use direct_IO_no_locking in ext4 dio read.

Signed-off-by: Jiaying Zhang <[email protected]>
---
fs/ext4/inode.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

Index: git-ext4/fs/ext4/inode.c
===================================================================
--- git-ext4.orig/fs/ext4/inode.c 2009-12-15 16:03:15.000000000 -0800
+++ git-ext4/fs/ext4/inode.c 2009-12-15 16:04:03.000000000 -0800
@@ -3580,7 +3580,15 @@ static ssize_t ext4_ind_direct_IO(int rw
}

retry:
- ret = blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ if (rw == READ && test_opt(inode->i_sb, DIOREAD_NOLOCK)
+ && (EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
+ 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))