From: Markus Elfring <Markus.Elfring@web.de>
To: linux-cifs@vger.kernel.org, Hyunchul Lee <hyc.lee@gmail.com>,
Namjae Jeon <linkinjeon@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Steve French <smfrench@gmail.com>, Tom Talpey <tom@talpey.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Ronnie Sahlberg <lsahlber@redhat.com>,
Stefan Metzmacher <metze@samba.org>
Subject: [PATCH] ksmbd: Avoid duplicate source code in ksmbd_lookup_fd_slow()
Date: Sat, 4 Oct 2025 15:40:25 +0200 [thread overview]
Message-ID: <e184fcc7-2af5-4522-9ec8-3c2e226a61f0@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 4 Oct 2025 15:30:16 +0200
Combine two condition checks into one in this function implementation
so that two statements are stored only once in the corresponding branch.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
fs/smb/server/vfs_cache.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/fs/smb/server/vfs_cache.c b/fs/smb/server/vfs_cache.c
index dfed6fce8904..16b326c4ffcf 100644
--- a/fs/smb/server/vfs_cache.c
+++ b/fs/smb/server/vfs_cache.c
@@ -470,11 +470,7 @@ struct ksmbd_file *ksmbd_lookup_fd_slow(struct ksmbd_work *work, u64 id,
}
fp = __ksmbd_lookup_fd(&work->sess->file_table, id);
- if (!__sanity_check(work->tcon, fp)) {
- ksmbd_fd_put(work, fp);
- return NULL;
- }
- if (fp->persistent_id != pid) {
+ if (!__sanity_check(work->tcon, fp) || fp->persistent_id != pid) {
ksmbd_fd_put(work, fp);
return NULL;
}
--
2.51.0
reply other threads:[~2025-10-04 13:40 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=e184fcc7-2af5-4522-9ec8-3c2e226a61f0@web.de \
--to=markus.elfring@web.de \
--cc=hyc.lee@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lsahlber@redhat.com \
--cc=metze@samba.org \
--cc=senozhatsky@chromium.org \
--cc=smfrench@gmail.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).