hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext2: use iomap_zero_range() for zeroing truncated page in DAX path 

Currently the last user of ext2_get_blocks() for DAX inodes was
dax_truncate_page(). Convert that to iomap_zero_range() so that all DAX
IO uses the iomap path.

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Jan Kara 2016-11-20 20:47:07 -05:00 committed by Theodore Ts'o
parent 0bd2d5ec3d
commit 00697eed38
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ext2/inode.c
View File

@ -850,6 +850,9 @@ struct iomap_ops ext2_iomap_ops = {
.iomap_begin = ext2_iomap_begin, .iomap_begin = ext2_iomap_begin,
.iomap_end = ext2_iomap_end, .iomap_end = ext2_iomap_end,
}; };
#else
/* Define empty ops for !CONFIG_FS_DAX case to avoid ugly ifdefs */
struct iomap_ops ext2_iomap_ops;
#endif /* CONFIG_FS_DAX */ #endif /* CONFIG_FS_DAX */
int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
@ -1293,9 +1296,11 @@ static int ext2_setsize(struct inode *inode, loff_t newsize)
inode_dio_wait(inode); inode_dio_wait(inode);
if (IS_DAX(inode)) if (IS_DAX(inode)) {
error = dax_truncate_page(inode, newsize, ext2_get_block); error = iomap_zero_range(inode, newsize,
else if (test_opt(inode->i_sb, NOBH)) PAGE_ALIGN(newsize) - newsize, NULL,
&ext2_iomap_ops);
} else if (test_opt(inode->i_sb, NOBH))
error = nobh_truncate_page(inode->i_mapping, error = nobh_truncate_page(inode->i_mapping,
newsize, ext2_get_block); newsize, ext2_get_block);
else else