summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2018-09-15 21:23:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-29 02:56:02 -0700
commite2dd3371bfd1bb30163d0cac205aa212be4bdf36 (patch)
tree9cf4dbac2e4db86f4b6d4ce4667932cd61881af7 /fs
parentd60e0a56ac37edda1a62a0a38e9c93dbf7752b1a (diff)
ext4, dax: add ext4_bmap to ext4_dax_aops
commit 94dbb63117e82253c9592816aa4465f0a9c94850 upstream. Ext4 mount path calls .bmap to the journal inode. This currently works for the DAX mount case because ext4_iget() always set 'ext4_da_aops' to any regular files. In preparation to fix ext4_iget() to set 'ext4_dax_aops' for ext4 DAX files, add ext4_bmap() to 'ext4_dax_aops', since bmap works for DAX inodes. Fixes: 5f0663bb4a64 ("ext4, dax: introduce ext4_dax_aops") Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Suggested-by: Jan Kara <jack@suse.cz> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0f730a5eda67..6042c019ea54 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3951,6 +3951,7 @@ static const struct address_space_operations ext4_dax_aops = {
.writepages = ext4_dax_writepages,
.direct_IO = noop_direct_IO,
.set_page_dirty = noop_set_page_dirty,
+ .bmap = ext4_bmap,
.invalidatepage = noop_invalidatepage,
};