From: Samuel Cabrero <scabrero@suse.com>
To: linux-cifs@vger.kernel.org
Cc: smfrench@gmail.com, pc@manguebit.com, ronniesahlberg@gmail.com,
sprasad@microsoft.com, tom@talpey.com, bharathsm@microsoft.com,
henrique.carvalho@suse.com, ematsumiya@suse.de,
Samuel Cabrero <scabrero@suse.com>
Subject: [PATCH 03/18] smb:client: Rename variable to match the rest of the code
Date: Fri, 10 Jul 2026 11:16:22 +0200 [thread overview]
Message-ID: <20260710091637.58873-4-scabrero@suse.com> (raw)
In-Reply-To: <20260710091637.58873-1-scabrero@suse.com>
struct cifs_swn_reg pointer is always named swnreg.
Signed-off-by: Samuel Cabrero <scabrero@suse.com>
---
fs/smb/client/cifs_swn.c | 50 ++++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/fs/smb/client/cifs_swn.c b/fs/smb/client/cifs_swn.c
index 2f8af8a281e8..0afb69b2eed2 100644
--- a/fs/smb/client/cifs_swn.c
+++ b/fs/smb/client/cifs_swn.c
@@ -301,66 +301,66 @@ static struct cifs_swn_reg *cifs_find_swn_reg(struct cifs_tcon *tcon)
*/
static struct cifs_swn_reg *cifs_get_swn_reg(struct cifs_tcon *tcon)
{
- struct cifs_swn_reg *reg = NULL;
+ struct cifs_swn_reg *swnreg = NULL;
int ret;
mutex_lock(&cifs_swnreg_idr_mutex);
/* Check if we are already registered for this network and share names */
- reg = cifs_find_swn_reg(tcon);
- if (!IS_ERR(reg)) {
- kref_get(®->ref_count);
+ swnreg = cifs_find_swn_reg(tcon);
+ if (!IS_ERR(swnreg)) {
+ kref_get(&swnreg->ref_count);
goto unlock;
- } else if (PTR_ERR(reg) != -EEXIST) {
+ } else if (PTR_ERR(swnreg) != -EEXIST) {
goto unlock;
}
- reg = kmalloc_obj(struct cifs_swn_reg, GFP_ATOMIC);
- if (reg == NULL) {
+ swnreg = kmalloc_obj(struct cifs_swn_reg, GFP_ATOMIC);
+ if (swnreg == NULL) {
ret = -ENOMEM;
goto fail_unlock;
}
- kref_init(®->ref_count);
+ kref_init(&swnreg->ref_count);
- reg->id = idr_alloc(&cifs_swnreg_idr, reg, 1, 0, GFP_ATOMIC);
- if (reg->id < 0) {
+ swnreg->id = idr_alloc(&cifs_swnreg_idr, swnreg, 1, 0, GFP_ATOMIC);
+ if (swnreg->id < 0) {
cifs_dbg(FYI, "%s: failed to allocate registration id\n", __func__);
- ret = reg->id;
+ ret = swnreg->id;
goto fail;
}
- reg->net_name = extract_hostname(tcon->tree_name);
- if (IS_ERR(reg->net_name)) {
- ret = PTR_ERR(reg->net_name);
+ swnreg->net_name = extract_hostname(tcon->tree_name);
+ if (IS_ERR(swnreg->net_name)) {
+ ret = PTR_ERR(swnreg->net_name);
cifs_dbg(VFS, "%s: failed to extract host name from target: %d\n", __func__, ret);
goto fail_idr;
}
- reg->share_name = extract_sharename(tcon->tree_name);
- if (IS_ERR(reg->share_name)) {
- ret = PTR_ERR(reg->share_name);
+ swnreg->share_name = extract_sharename(tcon->tree_name);
+ if (IS_ERR(swnreg->share_name)) {
+ ret = PTR_ERR(swnreg->share_name);
cifs_dbg(VFS, "%s: failed to extract share name from target: %d\n", __func__, ret);
goto fail_net_name;
}
- reg->net_name_notify = true;
- reg->share_name_notify =
+ swnreg->net_name_notify = true;
+ swnreg->share_name_notify =
(tcon->capabilities & SMB2_SHARE_CAP_ASYMMETRIC);
- reg->ip_notify = false;
+ swnreg->ip_notify = false;
- reg->tcon = tcon;
+ swnreg->tcon = tcon;
unlock:
mutex_unlock(&cifs_swnreg_idr_mutex);
- return reg;
+ return swnreg;
fail_net_name:
- kfree(reg->net_name);
+ kfree(swnreg->net_name);
fail_idr:
- idr_remove(&cifs_swnreg_idr, reg->id);
+ idr_remove(&cifs_swnreg_idr, swnreg->id);
fail:
- kfree(reg);
+ kfree(swnreg);
fail_unlock:
mutex_unlock(&cifs_swnreg_idr_mutex);
return ERR_PTR(ret);
--
2.54.0
next prev parent reply other threads:[~2026-07-10 9:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-10 9:16 [PATCH 00/18] SWN: Decouple witness registrations and tcons Samuel Cabrero
2026-07-10 9:16 ` [PATCH 01/18] Revert "smb: client: resolve SWN tcon from live registrations" Samuel Cabrero
2026-07-10 9:16 ` [PATCH 02/18] smb:client: Adjust witness notification request Samuel Cabrero
2026-07-10 9:16 ` Samuel Cabrero [this message]
2026-07-10 9:16 ` [PATCH 04/18] smb:client: Split idr remove and release functions Samuel Cabrero
2026-07-10 9:16 ` [PATCH 05/18] smb:client: Add a specific task to refresh witness registrations Samuel Cabrero
2026-07-10 9:16 ` [PATCH 06/18] smb:client: Store the tcon dstaddr in the witness registration Samuel Cabrero
2026-07-10 9:16 ` [PATCH 07/18] smb:client: Fix printf format string Samuel Cabrero
2026-07-10 9:16 ` [PATCH 08/18] smb:client: Save memory allocations Samuel Cabrero
2026-07-10 9:16 ` [PATCH 09/18] smb:client: Use the correct return code Samuel Cabrero
2026-07-10 9:16 ` [PATCH 10/18] smb:client: Improve tcon matching logic Samuel Cabrero
2026-07-10 9:16 ` [PATCH 11/18] smb:client: Pass the tcon to cifs_swn_send_register_message Samuel Cabrero
2026-07-10 9:16 ` [PATCH 12/18] smb:client: Pass the tcon to notification handlers Samuel Cabrero
2026-07-10 9:16 ` [PATCH 13/18] smb:client: Introduce swn_notification struct Samuel Cabrero
2026-07-10 9:16 ` [PATCH 14/18] smb:client: Cache auth info Samuel Cabrero
2026-07-10 9:16 ` [PATCH 15/18] smb:client: Do not store the tcon reference, find a matching one Samuel Cabrero
2026-07-10 9:16 ` [PATCH 16/18] smb:client: Simplify registration creation Samuel Cabrero
2026-07-10 9:16 ` [PATCH 17/18] smb:client: Improve registration network and share names handling Samuel Cabrero
2026-07-10 9:16 ` [PATCH 18/18] smb:client: Avoid witness re-register if the address did not change Samuel Cabrero
2026-07-10 14:16 ` [PATCH 00/18] SWN: Decouple witness registrations and tcons Enzo Matsumiya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260710091637.58873-4-scabrero@suse.com \
--to=scabrero@suse.com \
--cc=bharathsm@microsoft.com \
--cc=ematsumiya@suse.de \
--cc=henrique.carvalho@suse.com \
--cc=linux-cifs@vger.kernel.org \
--cc=pc@manguebit.com \
--cc=ronniesahlberg@gmail.com \
--cc=smfrench@gmail.com \
--cc=sprasad@microsoft.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox