diff options
author | Jan Kara <jack@suse.cz> | 2016-03-08 23:08:10 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2016-03-08 23:08:10 -0500 |
commit | 705965bd6dfadc3b2e0241da1423ef660bdd04c8 (patch) | |
tree | c29f27d3d461da8b36c7708ea5f21778b7df40c3 /fs/ext4/indirect.c | |
parent | e142d05263a4beedefd331d445c394f4397e9f03 (diff) |
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: | |||
693 | } | 693 | } |
694 | if (IS_DAX(inode)) | 694 | if (IS_DAX(inode)) |
695 | ret = dax_do_io(iocb, inode, iter, offset, | 695 | ret = dax_do_io(iocb, inode, iter, offset, |
696 | ext4_get_block, NULL, 0); | 696 | ext4_dio_get_block, NULL, 0); |
697 | else | 697 | else |
698 | ret = __blockdev_direct_IO(iocb, inode, | 698 | ret = __blockdev_direct_IO(iocb, inode, |
699 | inode->i_sb->s_bdev, iter, | 699 | inode->i_sb->s_bdev, iter, |
700 | offset, ext4_get_block, NULL, | 700 | offset, ext4_dio_get_block, |
701 | NULL, 0); | 701 | NULL, NULL, 0); |
702 | inode_dio_end(inode); | 702 | inode_dio_end(inode); |
703 | } else { | 703 | } else { |
704 | locked: | 704 | locked: |
705 | if (IS_DAX(inode)) | 705 | if (IS_DAX(inode)) |
706 | ret = dax_do_io(iocb, inode, iter, offset, | 706 | ret = dax_do_io(iocb, inode, iter, offset, |
707 | ext4_get_block, NULL, DIO_LOCKING); | 707 | ext4_dio_get_block, NULL, DIO_LOCKING); |
708 | else | 708 | else |
709 | ret = blockdev_direct_IO(iocb, inode, iter, offset, | 709 | ret = blockdev_direct_IO(iocb, inode, iter, offset, |
710 | ext4_get_block); | 710 | ext4_dio_get_block); |
711 | 711 | ||
712 | if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) { | 712 | if (unlikely(iov_iter_rw(iter) == WRITE && ret < 0)) { |
713 | loff_t isize = i_size_read(inode); | 713 | loff_t isize = i_size_read(inode); |