summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-11 16:52:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-11 16:52:08 -0800
commit359c92c02bfae1a6f1e8e37c298e518fd256642c (patch)
treee441807d78b048e970f1f52f908d864468add31d /fs/ext2
parent61a75954034f951a77d58b1cfb9186c62e6abcf8 (diff)
parent96222d53842dfe54869ec4e1b9d4856daf9105a2 (diff)
downloadlinux-stable-359c92c02bfae1a6f1e8e37c298e518fd256642c.tar.gz
linux-stable-359c92c02bfae1a6f1e8e37c298e518fd256642c.tar.bz2
linux-stable-359c92c02bfae1a6f1e8e37c298e518fd256642c.zip
Merge tag 'dax-fixes-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull dax fixes from Dan Williams: "A fix for an xfstest failure and some and an update that removes an fsdax dependency on block devices. Summary: - Fix RWF_NOWAIT writes to properly return -EAGAIN - Clean up an unused helper - Update dax_writeback_mapping_range to not need a block_device argument" * tag 'dax-fixes-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: pass NOWAIT flag to iomap_apply dax: Get rid of fs_dax_get_by_host() helper dax: Pass dax_dev instead of bdev to dax_writeback_mapping_range()
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 119667e65890..c885cf7d724b 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -960,8 +960,9 @@ ext2_writepages(struct address_space *mapping, struct writeback_control *wbc)
static int
ext2_dax_writepages(struct address_space *mapping, struct writeback_control *wbc)
{
- return dax_writeback_mapping_range(mapping,
- mapping->host->i_sb->s_bdev, wbc);
+ struct ext2_sb_info *sbi = EXT2_SB(mapping->host->i_sb);
+
+ return dax_writeback_mapping_range(mapping, sbi->s_daxdev, wbc);
}
const struct address_space_operations ext2_aops = {