projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...
[cascardo/linux.git]
/
fs
/
xfs
/
xfs_aops.c
diff --git
a/fs/xfs/xfs_aops.c
b/fs/xfs/xfs_aops.c
index
379c089
..
a9ebabf
100644
(file)
--- a/
fs/xfs/xfs_aops.c
+++ b/
fs/xfs/xfs_aops.c
@@
-55,7
+55,7
@@
xfs_count_page_state(
} while ((bh = bh->b_this_page) != head);
}
} while ((bh = bh->b_this_page) != head);
}
-
STATIC
struct block_device *
+struct block_device *
xfs_find_bdev_for_inode(
struct inode *inode)
{
xfs_find_bdev_for_inode(
struct inode *inode)
{
@@
-1208,6
+1208,10
@@
xfs_vm_writepages(
struct writeback_control *wbc)
{
xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);
struct writeback_control *wbc)
{
xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);
+ if (dax_mapping(mapping))
+ return dax_writeback_mapping_range(mapping,
+ xfs_find_bdev_for_inode(mapping->host), wbc);
+
return generic_writepages(mapping, wbc);
}
return generic_writepages(mapping, wbc);
}