summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Zwisler <ross.zwisler@linux.intel.com>2016-11-08 11:30:58 +1100
committerDave Chinner <david@fromorbit.com>2016-11-08 11:30:58 +1100
commit547edce3ba234a5161c6e1f4389f4a0d2f8451aa (patch)
treedfee44529cd29dd8feb3aff0426e5370db206a99
parent1001354ca34179f3db924eb66672442a173147dc (diff)
downloadop-kernel-dev-547edce3ba234a5161c6e1f4389f4a0d2f8451aa.zip
op-kernel-dev-547edce3ba234a5161c6e1f4389f4a0d2f8451aa.tar.gz
ext4: tell DAX the size of allocation holes
When DAX calls _ext4_get_block() and the file offset points to a hole we currently don't set bh->b_size. This is current worked around via buffer_size_valid() in fs/dax.c. _ext4_get_block() has the hole size information from ext4_map_blocks(), so populate bh->b_size so we can remove buffer_size_valid() in a later patch. Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/ext4/inode.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9c06472..3d58b2b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -767,6 +767,9 @@ static int _ext4_get_block(struct inode *inode, sector_t iblock,
ext4_update_bh_state(bh, map.m_flags);
bh->b_size = inode->i_sb->s_blocksize * map.m_len;
ret = 0;
+ } else if (ret == 0) {
+ /* hole case, need to fill in bh->b_size */
+ bh->b_size = inode->i_sb->s_blocksize * map.m_len;
}
return ret;
}
OpenPOWER on IntegriCloud