From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.smtpout.orange.fr (smtp-20.smtpout.orange.fr [80.12.242.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0464E1F5821 for ; Sat, 13 Jun 2026 20:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.12.242.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781382358; cv=none; b=ojGcr+6usxniNCKv/ObeZn1APwoVjE2+Ro+mSmpGqQfb6IUxxr5FKLfpU26WD/3dAts3LVTJJQ674aT+0DybwW1Z3t60mB/26/FyGYH7GkJWDLl6S9t0RpQ/w4reDpPr7jeInflP2aG+CK1eaQHJjyaupwiQoyh5uAyX2i0eLCU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781382358; c=relaxed/simple; bh=s+RIUfmjQ+kw+0Y/ld0ezMtUVvuWPlH9NCe31EoWS8U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=XSi9LqtPNN2A7/SD9imrmSq3y1DPIB0cAI0oS0AO/CSXx2o93k1i4rX58rjHqDO9b/BbTPVMppatbKCEkhCDFIWF7UWs77rbUm+FqTRi9WB0IJgP6tRQo0xH9ZqlYuxSTBPXepXt/3gOva0yfsMi/b6PvzZut2VMH1uQOAwX2dQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr; spf=pass smtp.mailfrom=wanadoo.fr; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b=NaWZOXfS; arc=none smtp.client-ip=80.12.242.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=wanadoo.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wanadoo.fr header.i=@wanadoo.fr header.b="NaWZOXfS" Received: from [IPV6:2a01:cb10:785:b00:8347:f260:7456:7662] ([10.64.95.111]) by smtp.orange.fr with ESMTP id YUuKwMjwU8HACYUuKwHwLq; Sat, 13 Jun 2026 22:24:44 +0200 Received: from [IPV6:2a01:cb10:785:b00:8347:f260:7456:7662] ([IPv6:2a01:cb10:785:b00:8347:f260:7456:7662]) by smtp.orange.fr with ESMTPSA id YUuBwnQnHUNPnYUuCwDWzm; Sat, 13 Jun 2026 22:24:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1781382277; bh=T53gq3dU53YvAa/eX9/b169DvQ27KdVJWE91zst97qw=; h=Message-ID:Date:MIME-Version:Subject:To:From; b=NaWZOXfSZB9xI3PKEsCFJ/SvmhWfbrf9acmXp7Q7bmd1zWPVYGpow2SGAlEu5s2Ix Ihr/lhPIJR+/8aZ88fvqxJCJ9cZPvyFgINMFehGwWWdd7qceA8ON3L1tytss4hD2Ya RCMgAShturqI0DofnKk8ErwT2tTE7yPv0Rm4hqBrQGbJKO1zMPvcyoVOurxK7YfeKP bhrc6WPMNxL43nHN52u1/k2ALaA/wecNyilDHYHv5prqS3/JuV6VwockwhBXehcClk aMpClHhGczV4L/B9y5IktgoYVow79Z5ygg3EdCK8vaFpqGYEQHya4qdK4RhY1FMz7c nzAzWPjxHHBNw== X-ME-Helo: [IPV6:2a01:cb10:785:b00:8347:f260:7456:7662] X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 13 Jun 2026 22:24:37 +0200 X-ME-IP: 2a01:cb10:785:b00:8347:f260:7456:7662 Message-ID: <1c8e10c9-def7-4f0d-8aa1-23c8035a38c8@wanadoo.fr> Date: Sat, 13 Jun 2026 22:24:35 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] NFS: Use common error handling code in nfs_alloc_server() To: Markus Elfring , anna@kernel.org, brauner@kernel.org, chuck.lever@oracle.com, hch@lst.de, trondmy@kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org References: <0d2d7158-45c3-4c8b-8ca5-33a5b3445343@web.de> Content-Language: en-US, fr-FR From: Christophe JAILLET In-Reply-To: <0d2d7158-45c3-4c8b-8ca5-33a5b3445343@web.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Le 10/06/2026 à 18:35, Markus Elfring a écrit : > From: Markus Elfring > Date: Wed, 10 Jun 2026 18:28:17 +0200 > > Use an additional label so that a bit of exception handling can be better > reused at the end of this function implementation. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring > --- > fs/nfs/client.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/fs/nfs/client.c b/fs/nfs/client.c > index 73b95318ba48..50482257667d 100644 > --- a/fs/nfs/client.c > +++ b/fs/nfs/client.c > @@ -1063,10 +1063,8 @@ struct nfs_server *nfs_alloc_server(void) > return NULL; > > server->s_sysfs_id = ida_alloc(&s_sysfs_ids, GFP_KERNEL); If an error occurs after a successful ida_alloc(), then ida_free() needs to be called in the error handling path. CJ > - if (server->s_sysfs_id < 0) { > - kfree(server); > - return NULL; > - } > + if (server->s_sysfs_id < 0) > + goto free_server; > > server->client = server->client_acl = ERR_PTR(-EINVAL); > > @@ -1087,10 +1085,8 @@ struct nfs_server *nfs_alloc_server(void) > atomic_long_set(&server->nr_active_delegations, 0); > > server->io_stats = nfs_alloc_iostats(); > - if (!server->io_stats) { > - kfree(server); > - return NULL; > - } > + if (!server->io_stats) > + goto free_server; > > server->change_attr_type = NFS4_CHANGE_TYPE_IS_UNDEFINED; > > @@ -1103,6 +1099,10 @@ struct nfs_server *nfs_alloc_server(void) > rpc_init_wait_queue(&server->uoc_rpcwaitq, "NFS UOC"); > > return server; > + > +free_server: > + kfree(server); > + return NULL; > } > EXPORT_SYMBOL_GPL(nfs_alloc_server); >