| From: Chengguang Xu <cgxu519@mykernel.net> |
| Date: Tue, 5 Nov 2019 12:51:00 +0800 |
| Subject: ext2: check err when partial != NULL |
| |
| commit e705f4b8aa27a59f8933e8f384e9752f052c469c upstream. |
| |
| Check err when partial == NULL is meaningless because |
| partial == NULL means getting branch successfully without |
| error. |
| |
| Link: https://lore.kernel.org/r/20191105045100.7104-1-cgxu519@mykernel.net |
| Signed-off-by: Chengguang Xu <cgxu519@mykernel.net> |
| Signed-off-by: Jan Kara <jack@suse.cz> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| fs/ext2/inode.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/fs/ext2/inode.c |
| +++ b/fs/ext2/inode.c |
| @@ -696,11 +696,14 @@ static int ext2_get_blocks(struct inode |
| if (!partial) { |
| count++; |
| mutex_unlock(&ei->truncate_mutex); |
| - if (err) |
| - goto cleanup; |
| clear_buffer_new(bh_result); |
| goto got_it; |
| } |
| + |
| + if (err) { |
| + mutex_unlock(&ei->truncate_mutex); |
| + goto cleanup; |
| + } |
| } |
| |
| /* |
