diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-03-12 08:18:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-12 08:18:26 +0000 |
| commit | 8f1c5b47f4b2051483f7b7f17ae943973f9323b4 (patch) | |
| tree | 2994131e9627b0ea5e272ee8842e7927cdc1c74f | |
| parent | 8b2bd3ddf4ecbde7032ed514b8bd7c73b493b222 (diff) | |
| parent | 6ec4583e9b03f64166902b4b4d8301d0f62b49bc (diff) | |
ext4: fix inline data error paths
am: 6ec4583e9b
Change-Id: I288454fe8c77883f859f8bb7705727bd8c52c378
| -rw-r--r-- | fs/ext4/inline.c | 9 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 20 |
2 files changed, 23 insertions, 6 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 98ca2bb1b829..092925a87dae 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -947,8 +947,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 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 8a08807359b5..a670f7aa9469 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1177,8 +1177,11 @@ static int ext4_write_end(struct file *file, if (ext4_has_inline_data(inode)) { ret = ext4_write_inline_data_end(inode, pos, len, copied, page); - if (ret < 0) + if (ret < 0) { + unlock_page(page); + put_page(page); goto errout; + } copied = ret; } else copied = block_write_end(file, mapping, pos, @@ -1281,10 +1284,16 @@ static int ext4_journalled_write_end(struct file *file, BUG_ON(!ext4_handle_valid(handle)); - if (ext4_has_inline_data(inode)) - copied = ext4_write_inline_data_end(inode, pos, len, - copied, page); - else if (unlikely(copied < len) && !PageUptodate(page)) { + if (ext4_has_inline_data(inode)) { + ret = ext4_write_inline_data_end(inode, pos, len, + copied, page); + if (ret < 0) { + unlock_page(page); + put_page(page); + goto errout; + } + copied = ret; + } else if (unlikely(copied < len) && !PageUptodate(page)) { copied = 0; ext4_journalled_zero_new_buffers(handle, page, from, to); } else { @@ -1319,6 +1328,7 @@ static int ext4_journalled_write_end(struct file *file, */ ext4_orphan_add(handle, inode); +errout: ret2 = ext4_journal_stop(handle); if (!ret) ret = ret2; |