aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4/inline.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2017-02-04 23:04:00 -0500
committerTheodore Ts'o <tytso@mit.edu>2017-02-04 23:04:00 -0500
commiteb5efbcb762aee4b454b04f7115f73ccbcf8f0ef (patch)
treed8502cb44de45fe27a69b4b352bd763f2b1a1752 /fs/ext4/inline.c
parent1c83a9aab807f7452c4957b2401e1cbf43941820 (diff)
downloadlinux-stericsson-eb5efbcb762aee4b454b04f7115f73ccbcf8f0ef.tar.gz
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.c9
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,
struct page *page)
{
int i_size_changed = 0;
+ int ret;
- copied = ext4_write_inline_data_end(inode, pos, len, copied, page);
+ ret = ext4_write_inline_data_end(inode, pos, len, copied, page);
+ if (ret < 0) {
+ unlock_page(page);
+ put_page(page);
+ return ret;
+ }
+ copied = ret;
/*
* No need to use i_size_read() here, the i_size