diff options
| author | Jan Kara <jack@suse.cz> | 2016-03-09 05:08:10 +0100 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-03-09 05:08:10 +0100 |
| commit | 705965bd6dfadc3b2e0241da1423ef660bdd04c8 (patch) | |
| tree | c29f27d3d461da8b36c7708ea5f21778b7df40c3 /fs/ext4/indirect.c | |
| parent | ext4: use i_mutex to serialize unaligned AIO DIO (diff) | |
| download | linux-705965bd6dfadc3b2e0241da1423ef660bdd04c8.tar.xz linux-705965bd6dfadc3b2e0241da1423ef660bdd04c8.zip | |
ext4: rename and split get blocks functions
Rename ext4_get_blocks_write() to ext4_get_blocks_unwritten() to better
describe what it does. Also split out get blocks functions for direct
IO. Later we move functionality from _ext4_get_blocks() there. There's no
functional change in this patch.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/indirect.c')
| -rw-r--r-- | fs/ext4/indirect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 355ef9c36c87..1655ff195e0e 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -693,21 +693,21 @@ retry: } if (IS_DAX(inode)) ret = dax_do_io(iocb, inode, iter, offset, - ext4_get_block, NULL, 0); + ext4_dio_get_block, NULL, 0); else ret = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter, - offset, ext4_get_block, NULL, - NULL, 0); + offset, ext4_dio_get_block, + NULL, NULL, 0); inode_dio_end(inode); } else { locked: if (IS_DAX(inode)) ret = dax_do_io(iocb, inode, iter, offset, - ext4_get_block, NULL, DIO_LOCKING); + ext4_dio_get_block, NULL, DIO_LOCKING); else ret = blockdev_direct_IO(iocb, inode, iter, offset, - ext4_get_block); + ext4_dio_get_block); if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) { loff_t isize = i_size_read(inode); |