aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4/inline.c
diff options
context:
space:
mode:
authormartin coulon <martinusbe@gmail.com>2018-07-11 23:20:51 +0200
committerGitHub <noreply@github.com>2018-07-11 23:20:51 +0200
commit14c6f2d81a3d3f0ab7e3a8a73714d16a64bd420d (patch)
tree9216b5b9335d52a6134c26b5bf54ef2e5c7fdf13 /fs/ext4/inline.c
parent32769b627546b549eaaa5e60dfa761a38f87da88 (diff)
parent29b340530c2f792a824afdbcd3b1cc0a47e9b631 (diff)
Merge pull request #51 from nathanchance/8.1HEADp9.0o8.1
Merge 3.18.115 into 8.1
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r--fs/ext4/inline.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 4be5b04863c8..fcdf2df720c8 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -434,6 +434,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle,
memset((void *)ext4_raw_inode(&is.iloc)->i_block,
0, EXT4_MIN_INLINE_DATA_SIZE);
+ memset(ei->i_data, 0, EXT4_MIN_INLINE_DATA_SIZE);
if (EXT4_HAS_INCOMPAT_FEATURE(inode->i_sb,
EXT4_FEATURE_INCOMPAT_EXTENTS)) {