diff options
author | Theodore Ts'o <tytso@mit.edu> | 2017-02-04 23:04:00 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2017-02-04 23:04:00 -0500 |
commit | eb5efbcb762aee4b454b04f7115f73ccbcf8f0ef (patch) | |
tree | d8502cb44de45fe27a69b4b352bd763f2b1a1752 /fs/ext4/inline.c | |
parent | 1c83a9aab807f7452c4957b2401e1cbf43941820 (diff) |
ext4: fix inline data error paths
The write_end() function must always unlock the page and drop its ref
count, even on an error.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4/inline.c')
-rw-r--r-- | fs/ext4/inline.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 338cfd862adb..b777b8aa14ae 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c | |||
@@ -943,8 +943,15 @@ int ext4_da_write_inline_data_end(struct inode *inode, loff_t pos, | |||
943 | struct page *page) | 943 | struct page *page) |
944 | { | 944 | { |
945 | int i_size_changed = 0; | 945 | int i_size_changed = 0; |
946 | int ret; | ||
946 | 947 | ||
947 | copied = ext4_write_inline_data_end(inode, pos, len, copied, page); | 948 | ret = ext4_write_inline_data_end(inode, pos, len, copied, page); |
949 | if (ret < 0) { | ||
950 | unlock_page(page); | ||
951 | put_page(page); | ||
952 | return ret; | ||
953 | } | ||
954 | copied = ret; | ||
948 | 955 | ||
949 | /* | 956 | /* |
950 | * No need to use i_size_read() here, the i_size | 957 | * No need to use i_size_read() here, the i_size |