From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753890AbcICMSu (ORCPT ); Sat, 3 Sep 2016 08:18:50 -0400 Received: from mout.web.de ([212.227.15.4]:60993 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752951AbcICMSr (ORCPT ); Sat, 3 Sep 2016 08:18:47 -0400 Subject: [PATCH 05/17] s390/debug: Fix jump targets in debug_info_alloc() To: linux-s390@vger.kernel.org, David Hildenbrand , Heiko Carstens , Joe Perches , Martin Schwidefsky References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: <04f27ca2-274e-d09c-fc3e-d0a387f6bf05@users.sourceforge.net> Date: Sat, 3 Sep 2016 14:18:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:nv02p7yt7UkZB149PUgUY2ui2iULQ94HIzFRx1R3+O2GLinp3yv 4sUFLTPQFJehDc4wJQUBxf/1qIv+1U2+rMo6xnEkdzJCHtdBawJYS5ZMTroATl03HgcGLkD 3IiC2m8dDxxWNa6IuG0gcj16Yp8A1yOZG/69/dF7QBPVgy/juNxLbkstiUvW5YRk9pBDYbV NIpQeIYH6+/QCATuLZCZw== X-UI-Out-Filterresults: notjunk:1;V01:K0:oY7D6Z9OSiI=:CK41T9SJd5eXSMhUnFacq4 ZsioCqN646MS1mdzowDhb5S7VL5CPuhUpJm4D2aTH5AA0Lyu3owMdkl7sNcAtOvBXWshvVPF7 9lNEjXefk8nMnlSOpeEmTghEvgw+TQ0x7jBX+cKI13VXtHZZfZ/kQmy0Kk73nZ1GN1wdhUi0s 48GShid5tpNvmCT7XPk2Lwfg1gOvfcTk4ZW0iMNVQG+V45HbP+9C4wq7FeDGQvUEfY87AF7rn EVl6zTzq923fXJrshxwYwP3YIyWqwa48pjtK6T8zcke5Fx02mHRTsa0p9LSqPnSW4lJMZLBDA Zj7MbzIYkdm5RwFgmUsLlW+9pPb5p+4mLJsHp80yMm07yrtrEn/BGhdpHQ23DklSVy0kIwAMd TSe/evTQyNYrl5ilUEviX5aYsvQheua8HFofW0xJILZix+EgiXZHio0wmwR9Eoh47rYgtyZuo jApl06sP7sWxk+EN9wrQo/3euOy+6B6YmWOGFG18HG6tQbUM6c2bsAqWjjPx/D6s0yLpRBErp qsMAjSfwSsMwmXJ5Rg/Ee+nSq35W1uZq3Rv3YMOQloA6syE2J6nFuTNMdzNYoivquYg7Hnk0h AofAdQyVKfe3mexUiDWKS8KBvjCdUg9tShZVLBjuK6hit+/UvehbP6boBD4Z9zzGiG5nmcofh nUZgb9uBnnctcmDdQMXIYFEWlNv+mkiXrW8BYeibKODDMA3mJeiV+dKeoJD1Kf2R9JlM3O68I W+4Ska8eoZJpB6psTVKnBFN7yeCTx3dmfpkHp8YV2UBlzy4ZVmGyFYDHYP2itDoHqCAf3m8U5 F1G1rjr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 1 Sep 2016 18:26:58 +0200 Adjust jump targets according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- arch/s390/kernel/debug.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c index 0af14a4..c5da41b 100644 --- a/arch/s390/kernel/debug.c +++ b/arch/s390/kernel/debug.c @@ -244,17 +244,17 @@ debug_info_alloc(const char *name, int pages_per_area, int nr_areas, rc = kmalloc(sizeof(debug_info_t), GFP_KERNEL); if(!rc) - goto fail_malloc_rc; + goto exit; rc->active_entries = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); if(!rc->active_entries) - goto fail_malloc_active_entries; + goto free_rc; rc->active_pages = kcalloc(nr_areas, sizeof(int), GFP_KERNEL); if(!rc->active_pages) - goto fail_malloc_active_pages; + goto free_entries; if((mode == ALL_AREAS) && (pages_per_area != 0)){ rc->areas = debug_areas_alloc(pages_per_area, nr_areas); if(!rc->areas) - goto fail_malloc_areas; + goto free_pages; } else { rc->areas = NULL; } @@ -275,14 +275,13 @@ debug_info_alloc(const char *name, int pages_per_area, int nr_areas, atomic_set(&(rc->ref_count), 0); return rc; - -fail_malloc_areas: + free_pages: kfree(rc->active_pages); -fail_malloc_active_pages: + free_entries: kfree(rc->active_entries); -fail_malloc_active_entries: + free_rc: kfree(rc); -fail_malloc_rc: + exit: return NULL; } -- 2.9.3