From: Steve French <smfrench@gmail.com>
To: Henrique Carvalho <henrique.carvalho@suse.com>
Cc: Markus Elfring <Markus.Elfring@web.de>,
linux-cifs@vger.kernel.org, Bharath SM <bharathsm@microsoft.com>,
Paulo Alcantara <pc@manguebit.org>,
Shyam Prasad N <sprasad@microsoft.com>,
LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] smb: client: Reduce the scopes for a few variables in two functions
Date: Mon, 6 Oct 2025 12:07:18 -0500 [thread overview]
Message-ID: <CAH2r5mvNM+z6re5toyNOJXewE0=9u2f+xxPXO5xTsMCj5nUWTw@mail.gmail.com> (raw)
In-Reply-To: <8e79516d-ad82-46bd-af00-3a8594a0baee@suse.com>
merged into cifs-2.6.git for-next
On Mon, Oct 6, 2025 at 9:11 AM Henrique Carvalho
<henrique.carvalho@suse.com> wrote:
>
> Acked-by: Henrique Carvalho <henrique.carvalho@suse.com>
>
> On 10/5/25 2:10 PM, Markus Elfring wrote:
> > From: Markus Elfring <elfring@users.sourceforge.net>
> > Date: Sun, 5 Oct 2025 19:01:48 +0200
> >
> > * cifs_lookup():
> > Move the definition for the local variable “cfid” into an else branch
> > so that the corresponding setting will only be performed if a NULL inode
> > was detected during lookup by this function.
> >
> > * cifs_d_revalidate():
> > Move the definition for the local variables “inode” and “rc” into
> > an if branch so that the corresponding setting will only be performed
> > after a d_really_is_positive() call.
> >
> > Move the definition for the local variable “cfid” into an else branch
> > so that the corresponding setting will only be performed if further data
> > processing will be needed for an open_cached_dir_by_dentry() call.
> >
> > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> > ---
> > fs/smb/client/dir.c | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/fs/smb/client/dir.c b/fs/smb/client/dir.c
> > index fc67a6441c96..7472fddadd4f 100644
> > --- a/fs/smb/client/dir.c
> > +++ b/fs/smb/client/dir.c
> > @@ -678,7 +678,6 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
> > const char *full_path;
> > void *page;
> > int retry_count = 0;
> > - struct cached_fid *cfid = NULL;
> >
> > xid = get_xid();
> >
> > @@ -717,6 +716,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry,
> > if (d_really_is_positive(direntry)) {
> > cifs_dbg(FYI, "non-NULL inode in lookup\n");
> > } else {
> > + struct cached_fid *cfid = NULL;
> > +
> > cifs_dbg(FYI, "NULL inode in lookup\n");
> >
> > /*
> > @@ -785,15 +786,13 @@ static int
> > cifs_d_revalidate(struct inode *dir, const struct qstr *name,
> > struct dentry *direntry, unsigned int flags)
> > {
> > - struct inode *inode = NULL;
> > - struct cached_fid *cfid;
> > - int rc;
> > -
> > if (flags & LOOKUP_RCU)
> > return -ECHILD;
> >
> > if (d_really_is_positive(direntry)) {
> > - inode = d_inode(direntry);
> > + int rc;
> > + struct inode *inode = d_inode(direntry);
> > +
> > if ((flags & LOOKUP_REVAL) && !CIFS_CACHE_READ(CIFS_I(inode)))
> > CIFS_I(inode)->time = 0; /* force reval */
> >
> > @@ -836,6 +835,7 @@ cifs_d_revalidate(struct inode *dir, const struct qstr *name,
> > } else {
> > struct cifs_sb_info *cifs_sb = CIFS_SB(dir->i_sb);
> > struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
> > + struct cached_fid *cfid;
> >
> > if (!open_cached_dir_by_dentry(tcon, direntry->d_parent, &cfid)) {
> > /*
>
> --
> Henrique
> SUSE Labs
>
--
Thanks,
Steve
prev parent reply other threads:[~2025-10-06 17:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-05 17:10 [PATCH] smb: client: Reduce the scopes for a few variables in two functions Markus Elfring
2025-10-06 14:09 ` Henrique Carvalho
2025-10-06 17:07 ` Steve French [this message]
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='CAH2r5mvNM+z6re5toyNOJXewE0=9u2f+xxPXO5xTsMCj5nUWTw@mail.gmail.com' \
--to=smfrench@gmail.com \
--cc=Markus.Elfring@web.de \
--cc=bharathsm@microsoft.com \
--cc=henrique.carvalho@suse.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@manguebit.org \
--cc=sprasad@microsoft.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).