diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-07 21:45:20 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-07 21:45:20 +0300 |
| commit | 65f619d2535197d97067eeeef75a40f25b552e69 (patch) | |
| tree | 13f96c51a2b591ed22f1771541998bb77178f685 /fs/ext4/inline.c | |
| parent | fbbaf700e7b163a0f1704b2d542ee28be11fce21 (diff) | |
| parent | 6d8c6c0f97ad8a3517c42b179c1dc8e77397d0e2 (diff) | |
| download | linux-65f619d2535197d97067eeeef75a40f25b552e69.tar.xz | |
Merge branch 'for-linus' into for-4.12/block
We've added a considerable amount of fixes for stalls and issues
with the blk-mq scheduling in the 4.11 series since forking
off the for-4.12/block branch. We need to do improvements on
top of that for 4.12, so pull in the previous fixes to make
our lives easier going forward.
Signed-off-by: Jens Axboe <axboe@fb.com>
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, |