From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755754AbdEFIoC (ORCPT ); Sat, 6 May 2017 04:44:02 -0400 Received: from mout.web.de ([212.227.17.11]:59613 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbdEFIny (ORCPT ); Sat, 6 May 2017 04:43:54 -0400 Subject: [PATCH 06/10] dlm: Delete an error message for a failed memory allocation in dlm_recover_waiters_pre() From: SF Markus Elfring To: cluster-devel@redhat.com, Christine Caulfield , David Teigland Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang References: <4bd895d7-9448-928d-1e4c-42326ce20607@users.sourceforge.net> Message-ID: <115ac618-840d-1be4-0e1d-c07f2541bd58@users.sourceforge.net> Date: Sat, 6 May 2017 10:43:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <4bd895d7-9448-928d-1e4c-42326ce20607@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:1xW8H5/mi3LpaKcInkqo5sAWhE44p/sZspHVZmUkIj7eOC3Oih1 lmo7EuxiJ8Tpn34W0TQoBRXAK5RVuVTtSgNlRatp0S65A1qf5WDHGHu0xR4GTJfEjgQ/AGl 2DVe3IvkVmN0VQ2ziBbPiMASobfbTmrx647iyNFAiifDBjv4Ptq6j+zWkQmFVMPlW4gCymR tqp/69x6CseDjas3gsUlA== X-UI-Out-Filterresults: notjunk:1;V01:K0:NgKje27ooVs=:4cpaU31vZPPjxD7N1cEUHs TaITAvO4DB+kR90p6kbd1QLIMf3aiRtHpUEbdbEgA4vLpAWxNfLDwLBfSwem4QjoS/wduDKfx gfn0i4svI1gllM7B64EkJoLUF8mwJDDniXTmN0AnD4m4fF2GNpnbr34E7KPOrX/xGgdg7YnVr zinkMXyKFZhQ5JLX9u8ikln5S/Q5bcMMiTomVVqEfQ0pDVSFhr6ht3Npe8Lnme2xFsBI1nU6B yNQEEm2WGHYHHKw1d80QqhzMDbqkucqtSZOvxyDYLv5Kgm7m5CQSCJHfHljrv9uyM4k0jDlec 2Sjm3DX0AEC0fsi8LfVCdwEnzZcp+3mLEI6W/rSiTQ1gSIYM+swyp6KxyhOwVqagOKK+4ds6I QyWC07Pet4JHtErIkkgt+GfTeB3uaiGi3vZe+VU80p2sXmCZfl7B8zIRvEQmDRFaQx7CwEbaQ cYjIUyphgWO3a/ZzDGV1/SWHsijuiXoaU5vEwXLSfLPTQu9WdaHkEbNYRKUG2V7tqQbddQg8E 3fsORUSySP4xhzZcdhsH8MiULS3vF3egtfBmecbRxPhwo5k+WQbqoDCZSQUH1UsUs0DhCU4kV NwPUxtRXBGgFxrGwf07ciByvo/w47Ch0CNJ9KqNYeuV1WM0fjkFnYCldV5FX5uMOpYjWNDYJe wgH/756zcZx2R3RTJB0gOMUH+foOPtbuwYVrxwmVlcfQKoZgU0nn32T96uCYmeP0fDqvOO43p JjK9ZBQez7DPHiAekcfQQD8UZia6k0dm/0pw6BqQ8TfiOV+LeTlQCsVB/9aJ1xIbvjlLlfXQG As5Bmy7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 6 May 2017 08:55:43 +0200 Omit an extra message for a memory allocation failure in this function. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- fs/dlm/lock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index ffadb817ad39..d4aaddec1b16 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -5120,10 +5120,8 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls) int dir_nodeid; ms_stub = kmalloc(sizeof(*ms_stub), GFP_KERNEL); - if (!ms_stub) { - log_error(ls, "dlm_recover_waiters_pre no mem"); + if (!ms_stub) return; - } mutex_lock(&ls->ls_waiters_mutex); -- 2.12.2