diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-02-04 23:04:00 -0500 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-12-31 01:44:58 +0100 |
| commit | 4e88333cb22e997474ac6ebe0c8300accb4a9ae8 (patch) | |
| tree | f44cd7b67f6da8f96f4837987f0346aaeeb0c289 /fs/ext4/inline.c | |
| parent | 69f97acdafdbaa55c6fe548899d091a715d686b8 (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
[@nathanchance: fixed conflicts]
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Joe Maples <joe@frap129.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 39ef740dd..3d015c536 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -929,8 +929,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 |