aboutsummaryrefslogtreecommitdiff
path: root/fs/ext2
diff options
context:
space:
mode:
authorGravatar Matthew Wilcox <matthew.r.wilcox@intel.com> 2015-02-16 15:59:06 -0800
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2015-02-16 17:56:03 -0800
commit4c0ccfef2e9f7418a6eb0bf07a2fc8f216365b18 (patch)
treeca1c0bebddf210eab5e5428bb0416d6bfc71495b /fs/ext2
parentdax,ext2: replace the XIP page fault handler with the DAX page fault handler (diff)
downloadlinux-4c0ccfef2e9f7418a6eb0bf07a2fc8f216365b18.tar.gz
linux-4c0ccfef2e9f7418a6eb0bf07a2fc8f216365b18.tar.bz2
linux-4c0ccfef2e9f7418a6eb0bf07a2fc8f216365b18.zip
dax,ext2: replace xip_truncate_page with dax_truncate_page
It takes a get_block parameter just like nobh_truncate_page() and block_truncate_page() Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Andreas Dilger <andreas.dilger@intel.com> Cc: Boaz Harrosh <boaz@plexistor.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Dave Chinner <david@fromorbit.com> Cc: Jan Kara <jack@suse.cz> Cc: Jens Axboe <axboe@kernel.dk> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 52978b853226..5ac0a3461b3c 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1210,7 +1210,7 @@ static int ext2_setsize(struct inode *inode, loff_t newsize)
inode_dio_wait(inode);
if (IS_DAX(inode))
- error = xip_truncate_page(inode->i_mapping, newsize);
+ error = dax_truncate_page(inode, newsize, ext2_get_block);
else if (test_opt(inode->i_sb, NOBH))
error = nobh_truncate_page(inode->i_mapping,
newsize, ext2_get_block);