cifs: Remove CIFSSMBSetPathInfoFB() fallback function

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, since commit f122121796f9 ("cifs: Fix changing
times and read-only attr over SMB1 smb_set_file_info() function") and
commit 92210ccd877b ("cifs: Add fallback code path for cifs_mkdir_setinfo()").

So the CIFSSMBSetPathInfoFB() is just code duplication, which is not needed
anymore. Therefore remove it.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index d39175cdf1b18107457e747d3301ed5a26eb0a73..40162d5554eaccbc95fd8649027b48ae66758313 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -5829,38 +5829,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,
@@ -5939,10 +5907,6 @@ SetTimesRetry:
        if (rc == -EAGAIN)
                goto SetTimesRetry;
 
-       if (rc == -EOPNOTSUPP)
-               return CIFSSMBSetPathInfoFB(xid, tcon, fileName, data,
-                                           nls_codepage, cifs_sb);
-
        return rc;
 }