From: "Pali Rohár" <pali@kernel.org>
To: Steve French <sfrench@samba.org>, Paulo Alcantara <pc@manguebit.com>
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 12/12] cifs: Remove CIFSSMBSetPathInfoFB() fallback function
Date: Tue, 31 Dec 2024 23:36:42 +0100 [thread overview]
Message-ID: <20241231223642.15722-12-pali@kernel.org> (raw)
In-Reply-To: <20241231223642.15722-1-pali@kernel.org>
This fallback function CIFSSMBSetPathInfoFB() is called only from
CIFSSMBSetPathInfo() function. CIFSSMBSetPathInfo() is used in
smb_set_file_info() which contains all required fallback code, including
fallback via filehandle.
So the CIFSSMBSetPathInfoFB() is just code duplication, which is not needed
anymore. Therefore remove it.
This change depends on other changes which are extending
cifs_mkdir_setinfo() and smb_set_file_info() functions.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
fs/smb/client/cifssmb.c | 36 ------------------------------------
1 file changed, 36 deletions(-)
diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index acbdb6d92306..9dc946138f18 100644
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -5478,38 +5478,6 @@ CIFSSMBSetFileDisposition(const unsigned int xid, struct cifs_tcon *tcon,
return rc;
}
-static int
-CIFSSMBSetPathInfoFB(const unsigned int xid, struct cifs_tcon *tcon,
- const char *fileName, const FILE_BASIC_INFO *data,
- const struct nls_table *nls_codepage,
- struct cifs_sb_info *cifs_sb)
-{
- int oplock = 0;
- struct cifs_open_parms oparms;
- struct cifs_fid fid;
- int rc;
-
- oparms = (struct cifs_open_parms) {
- .tcon = tcon,
- .cifs_sb = cifs_sb,
- .desired_access = GENERIC_WRITE,
- .create_options = cifs_create_options(cifs_sb, 0),
- .disposition = FILE_OPEN,
- .path = fileName,
- .fid = &fid,
- };
-
- rc = CIFS_open(xid, &oparms, &oplock, NULL);
- if (rc)
- goto out;
-
- rc = CIFSSMBSetFileInfo(xid, tcon, data, fid.netfid, current->tgid);
- CIFSSMBClose(xid, tcon, fid.netfid);
-out:
-
- return rc;
-}
-
int
CIFSSMBSetPathInfo(const unsigned int xid, struct cifs_tcon *tcon,
const char *fileName, const FILE_BASIC_INFO *data,
@@ -5586,10 +5554,6 @@ CIFSSMBSetPathInfo(const unsigned int xid, struct cifs_tcon *tcon,
if (rc == -EAGAIN)
goto SetTimesRetry;
- if (rc == -EOPNOTSUPP)
- return CIFSSMBSetPathInfoFB(xid, tcon, fileName, data,
- nls_codepage, cifs_sb);
-
return rc;
}
--
2.20.1
prev parent reply other threads:[~2024-12-31 22:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-31 22:36 [PATCH 01/12] cifs: Fix struct FILE_ALL_INFO Pali Rohár
2024-12-31 22:36 ` [PATCH 02/12] cifs: Fix calling CIFSFindFirst() for root path without msearch Pali Rohár
2024-12-31 22:36 ` [PATCH 03/12] cifs: Optimize CIFSFindFirst() response when not searching Pali Rohár
2024-12-31 22:36 ` [PATCH 04/12] cifs: Fix and improve cifs_is_path_accessible() function Pali Rohár
2024-12-31 22:36 ` [PATCH 05/12] cifs: Fix cifs_query_path_info() for Windows NT servers Pali Rohár
2024-12-31 22:36 ` [PATCH 06/12] cifs: Fix and improve cifs_query_path_info() and cifs_query_file_info() Pali Rohár
2025-01-07 0:22 ` [PATCH v2] " Pali Rohár
2024-12-31 22:36 ` [PATCH 07/12] cifs: Improve SMB1 stat() to work also for paths in DELETE_PENDING state Pali Rohár
2025-01-07 0:23 ` [PATCH v2] " Pali Rohár
2024-12-31 22:36 ` [PATCH 08/12] cifs: Remove code for querying FILE_INFO_STANDARD via CIFSSMBQPathInfo() Pali Rohár
2024-12-31 22:36 ` [PATCH 09/12] cifs: Allow fallback code in smb_set_file_info() also for directories Pali Rohár
2024-12-31 22:36 ` [PATCH 10/12] cifs: Fix changing times and read-only attr over SMB1 smb_set_file_info() function Pali Rohár
2024-12-31 22:36 ` [PATCH 11/12] cifs: Add fallback code path for cifs_mkdir_setinfo() Pali Rohár
2024-12-31 22:36 ` Pali Rohár [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=20241231223642.15722-12-pali@kernel.org \
--to=pali@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@manguebit.com \
--cc=sfrench@samba.org \
/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