diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:45 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-03-30 09:48:58 +0200 |
commit | c69f203df3e61414fbf1a66d130abfd7c3bf3fd0 (patch) | |
tree | a6850417a1871f7bf321ef0318bd8c43439d7fed /fs/ext4/inline.c | |
parent | 3906a13a6b4e78fbc0def03a808f091f0dff1b44 (diff) | |
parent | fe82203b63e598c34d96e846dea49679a726fc7a (diff) |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r-- | fs/ext4/inline.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 30a9f210d1e3..375fb1c05d49 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1169,10 +1169,9 @@ static int ext4_finish_convert_inline_dir(handle_t *handle, set_buffer_uptodate(dir_block); err = ext4_handle_dirty_dirent_node(handle, inode, dir_block); if (err) - goto out; + return err; set_buffer_verified(dir_block); -out: - return err; + return ext4_mark_inode_dirty(handle, inode); } static int ext4_convert_inline_data_nolock(handle_t *handle, |