{"id":2230534,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230534/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260429205236.456099-3-henrique.carvalho@suse.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.1/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260429205236.456099-3-henrique.carvalho@suse.com>","date":"2026-04-29T20:52:36","name":"[3/3] smb: client: make smb3_update_ses_channels() match expected API","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f5d4e40643ec3da98b487f39e5af550423edfb23","submitter":{"id":89563,"url":"http://patchwork.ozlabs.org/api/1.1/people/89563/?format=json","name":"Henrique Carvalho","email":"henrique.carvalho@suse.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260429205236.456099-3-henrique.carvalho@suse.com/mbox/","series":[{"id":502149,"url":"http://patchwork.ozlabs.org/api/1.1/series/502149/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=502149","date":"2026-04-29T20:52:34","name":"[1/3] smb: client: fix conflicting option validation for new mount API","version":1,"mbox":"http://patchwork.ozlabs.org/series/502149/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230534/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230534/checks/","tags":{},"headers":{"Return-Path":"\n <linux-cifs+bounces-11300-incoming=patchwork.ozlabs.org@vger.kernel.org>","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256\n header.s=google header.b=MpwalMYL;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c04:e001:36c::12fc:5321; helo=tor.lore.kernel.org;\n envelope-from=linux-cifs+bounces-11300-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com\n header.b=\"MpwalMYL\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=209.85.128.47","smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=suse.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=suse.com"],"Received":["from tor.lore.kernel.org (tor.lore.kernel.org\n [IPv6:2600:3c04:e001:36c::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5TzQ3Pplz1yHv\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 30 Apr 2026 06:53:22 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id 8CF213016D13\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 29 Apr 2026 20:53:20 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id B4A7839EF35;\n\tWed, 29 Apr 2026 20:53:18 +0000 (UTC)","from mail-wm1-f47.google.com (mail-wm1-f47.google.com\n [209.85.128.47])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 381D32FE58C\n\tfor <linux-cifs@vger.kernel.org>; Wed, 29 Apr 2026 20:53:17 +0000 (UTC)","by mail-wm1-f47.google.com with SMTP id\n 5b1f17b1804b1-4891c00e7aeso1615425e9.2\n        for <linux-cifs@vger.kernel.org>;\n Wed, 29 Apr 2026 13:53:17 -0700 (PDT)","from precision ([2a01:4b00:c007:bb00:be9d:a3c4:18b1:4a25])\n        by smtp.gmail.com with ESMTPSA id\n a92af1059eb24-12de3269b41sm3925240c88.13.2026.04.29.13.53.10\n        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n        Wed, 29 Apr 2026 13:53:14 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777495998; cv=none;\n b=E24u51ZOuW9UYCVn6ijkDDg6Oeo7cO6GfMRJC5nLr8k8iDd2O1QJpcIcAvq40osADhvufy4EA5AcE8XHy2El0T7+1Ul1JwEWZM8inZ0Ik7RwXU/oMiMCWgk19WLLSo+U4RLJUttFI+rujpYpOeemNEKlhYYrRMhcKGE+z94QOM8=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777495998; c=relaxed/simple;\n\tbh=IiFNR2+WijGb9FrHO/PADeJfGkQ9mQYCgDD03ICPANs=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=G087Q3+0xeczYS4ge218Jk6YlUyoK3inPpFr2rPRe5zZbFXU14a8YivWsOZFs6q3yPld7hRxLakyp4n6fpTcZIqRcLMYJCpgDUKVPpgfX/MYnstp2tJtFy6KegcW79ILL7J8b+QTkjLvTjFF/ZFnu8hopq6sGK3BoiyMLKDsB1o=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=suse.com;\n spf=pass smtp.mailfrom=suse.com;\n dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com\n header.b=MpwalMYL; arc=none smtp.client-ip=209.85.128.47","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=suse.com; s=google; t=1777495996; x=1778100796;\n darn=vger.kernel.org;\n        h=content-transfer-encoding:mime-version:references:in-reply-to\n         :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n         :message-id:reply-to;\n        bh=mJSq4V3powXkVcfGmSruYclyZoV2WmI9BprF8rckwPQ=;\n        b=MpwalMYLBrUmf3ZE1NOX3jnoTs022uwN8F9Pbh3QL/srUJ0Bj/QMuV1zK6BmV3visQ\n         KgQquQOykRRH82nKGFpttjEbemEkjpFNXPO9TqxEr+kHN04fyuJkNV67l69ZHVjnKF0E\n         EV5Xzz+obkPSZd+AF+eOvJfMU+Lk5EULqxIJWpVRftUl05cfWfM4LlZmHVY+0eGpU6H+\n         VG6BpUA1iwnsqDjjPpShmAEgNREJPoZd1/11VttZNFO2mC9LPYirJViosVxwCY2SKL0Z\n         fxpKD75T+hB4xhe+kr8vM/bs6yxm/PWPqpxUMYTb+oG8U+g0IvWXN6B5B3d82cVzrLFN\n         cy1w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n        d=1e100.net; s=20251104; t=1777495996; x=1778100796;\n        h=content-transfer-encoding:mime-version:references:in-reply-to\n         :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n         :to:cc:subject:date:message-id:reply-to;\n        bh=mJSq4V3powXkVcfGmSruYclyZoV2WmI9BprF8rckwPQ=;\n        b=Gr3rtWgtIt6pMfPpLAxOgVqGcE8wIRoCQMwV7sU9ZxvGu422kFYtfmZCf3tlTUznvt\n         b6LxszII9hrCxNnxGFnvAjtabFEGgLv/Hndh66L190UUuz/qocBbC96THfEnDDTqxWhJ\n         QTfMfNYVP4+/pFWUTvH/6kEEQu9S42emnHAZZjhA6Sa/n/80Ter4RZdRYVklHufUNrm3\n         aKfNKXuJEWwy+DYK7ZEXsHml9vALTsYAHkRQ0VmkAEHA3FDOQ8fPDt0ovWrfM9ZkIyTB\n         kdZPf27bBmaTZnjw0y8ldeaBRjoWVg2BLvxISbthf/Rbgm+omw6DtnbpS523fYNqD3e4\n         YFTg==","X-Forwarded-Encrypted":"i=1;\n AFNElJ8sQr2vN/76cSrxGoQtF6dQdUxA4y88vyiKW3A8OcyAkZc3/994hsXgjbW68GncmFtIGPGb5A5sziPg@vger.kernel.org","X-Gm-Message-State":"AOJu0YxBY1DZV68eydPZ6oOMqiVaaBCCsVMyhe4UAFLQ4OvLpErlMxlV\n\tEDHOrNdFpFf/C/7/zAMdn6juvOrE8Y4jMOhrfp4shvBNE/PhZVLMG/KwBbUZwSjrxUE=","X-Gm-Gg":"AeBDievLfbZ8z1gRL0vFyFXyhR+ROihKkHX1PpUfHTt3c3vIHFkD4ItEFcFpUW4UqDO\n\ti3bHSwomtB3f5MYRv6kwGWH3glzKqJrBlc3ouEclk+dnumPsvvOa8B1FvH+6n8t9uLFUCL6s2rs\n\tO/fmkTqSUFQ/LI4mgum+h9KxrhXK7ejW3uYy4/OHMyC53BFUGlc4vb0RgrSAm6IdkfKsFM4iEqT\n\tKxMXsMii+YvhhCLhNjI85nEh87E8OPRoDgDQ4k+3/QszMGbO9D8/B20Esqv8wQETBX2XkaEZHQK\n\tS+3+ZXE7IP4iLwNnP8bbRfUN7G++MoopwIr3EiSD2RW7C0VIIlfaYPg1snQqAF+DXRzCJ/mM/y6\n\tQzULQz12rGFU4g6cTb6m2QcVYQdhYWTmAHJUWv8sqU+08Dy0tg7Z4/uIjK58WAcpJk7H61kXoXE\n\tl0sAyVY+ETOya0E/hmmAWpnRSkf4sg1QGMwD494tYdmr7K","X-Received":"by 2002:a05:600c:1d18:b0:488:904b:f31 with SMTP id\n 5b1f17b1804b1-48a84459207mr2787985e9.22.1777495995617;\n        Wed, 29 Apr 2026 13:53:15 -0700 (PDT)","From":"Henrique Carvalho <henrique.carvalho@suse.com>","To":"sfrench@samba.org","Cc":"metze@samba.org,\n\tpc@manguebit.org,\n\tronniesahlberg@gmail.com,\n\tsprasad@microsoft.com,\n\ttom@talpey.com,\n\tbharathsm@microsoft.com,\n\tematsumiya@suse.de,\n\tlinux-cifs@vger.kernel.org,\n\tstable@vger.kernel.org","Subject":"[PATCH 3/3] smb: client: make smb3_update_ses_channels() match\n expected API","Date":"Wed, 29 Apr 2026 17:52:36 -0300","Message-ID":"<20260429205236.456099-3-henrique.carvalho@suse.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260429205236.456099-1-henrique.carvalho@suse.com>","References":"<20260429205236.456099-1-henrique.carvalho@suse.com>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"<linux-cifs.vger.kernel.org>","List-Subscribe":"<mailto:linux-cifs+subscribe@vger.kernel.org>","List-Unsubscribe":"<mailto:linux-cifs+unsubscribe@vger.kernel.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"smb3_update_ses_channels() was introduced with a 0-or-errno API, but\ncould return a positive channel count when growing channels. Existing\nreconnect paths mostly tolerated this, but newer callers can treat it as\nfailure.\n\nNormalize positive return values from cifs_try_adding_channels() to 0 so\nsmb3_update_ses_channels() follows the expected API used by its callers.\n\nFixes: ef529f655a2c (\"cifs: client: allow changing multichannel mount options on remount\")\nCc: stable@vger.kernel.org\nSigned-off-by: Henrique Carvalho <henrique.carvalho@suse.com>\n---\n fs/smb/client/smb2pdu.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)","diff":"diff --git a/fs/smb/client/smb2pdu.c b/fs/smb/client/smb2pdu.c\nindex cb61051f9af3..9eb7c16407cc 100644\n--- a/fs/smb/client/smb2pdu.c\n+++ b/fs/smb/client/smb2pdu.c\n@@ -236,9 +236,11 @@ int smb3_update_ses_channels(struct cifs_ses *ses, struct TCP_Server_Info *serve\n \tif (disable_mchan)\n \t\trc = cifs_chan_skip_or_disable(ses, server, from_reconnect, disable_mchan);\n \telse {\n-\t\tif (ses->chan_count < ses->chan_max)\n+\t\tif (ses->chan_count < ses->chan_max) {\n \t\t\trc = cifs_try_adding_channels(ses);\n-\t\telse if (ses->chan_count > ses->chan_max)\n+\t\t\tif (rc > 0)\n+\t\t\t\trc = 0;\n+\t\t} else if (ses->chan_count > ses->chan_max)\n \t\t\trc = cifs_chan_skip_or_disable(ses, server, from_reconnect, disable_mchan);\n \t}\n \n","prefixes":["3/3"]}