cifs: Remove unicode parameter from parse_reparse_point() function

This parameter is always true, so remove it and also remove dead code which
is never called (for all false code paths).

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

diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h
index fcc9da838b70f8144b5118deed1c2fdfe16165fe..81680001944df6808a5b5652535963d56a6dc98c 100644 (file)
--- a/fs/smb/client/cifsproto.h
+++ b/fs/smb/client/cifsproto.h
@@ -656,7 +656,7 @@ char *extract_sharename(const char *unc);
 int parse_reparse_point(struct reparse_data_buffer *buf,
                        u32 plen, struct cifs_sb_info *cifs_sb,
                        const char *full_path,
-                       bool unicode, struct cifs_open_info_data *data);
+                       struct cifs_open_info_data *data);
 int __cifs_sfu_make_node(unsigned int xid, struct inode *inode,
                         struct dentry *dentry, struct cifs_tcon *tcon,
                         const char *full_path, umode_t mode, dev_t dev,

diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c
index b387dfbaf16b053d16a11c0569c5845ffc9b8eae..0e47b8e097a09659243a23ce060a81abe29fcccc 100644 (file)
--- a/fs/smb/client/reparse.c
+++ b/fs/smb/client/reparse.c
@@ -536,7 +536,7 @@ static int parse_reparse_posix(struct reparse_posix_data *buf,
 }
 
 int smb2_parse_native_symlink(char **target, const char *buf, unsigned int len,
-                             bool unicode, bool relative,
+                             bool relative,
                              const char *full_path,
                              struct cifs_sb_info *cifs_sb)
 {
@@ -547,26 +547,24 @@ int smb2_parse_native_symlink(char **target, const char *buf, unsigned int len,
        int rc;
        int i;
 
-       /* Check that length it valid for unicode/non-unicode mode */
-       if (!len || (unicode && (len % 2))) {
+       /* Check that length it valid */
+       if (!len || (len % 2)) {
                cifs_dbg(VFS, "srv returned malformed symlink buffer\n");
                rc = -EIO;
                goto out;
        }
 
        /*
-        * Check that buffer does not contain UTF-16 null codepoint in unicode
-        * mode or null byte in non-unicode mode because Linux cannot process
-        * symlink with null byte.
+        * Check that buffer does not contain UTF-16 null codepoint
+        * because Linux cannot process symlink with null byte.
         */
-       if ((unicode && UniStrnlen((wchar_t *)buf, len/2) != len/2) ||
-           (!unicode && strnlen(buf, len) != len)) {
+       if (UniStrnlen((wchar_t *)buf, len/2) != len/2) {
                cifs_dbg(VFS, "srv returned null byte in native symlink target location\n");
                rc = -EIO;
                goto out;
        }
 
-       smb_target = cifs_strndup_from_utf16(buf, len, unicode, cifs_sb->local_nls);
+       smb_target = cifs_strndup_from_utf16(buf, len, true, cifs_sb->local_nls);
        if (!smb_target) {
                rc = -ENOMEM;
                goto out;
@@ -621,7 +619,7 @@ out:
 }
 
 static int parse_reparse_symlink(struct reparse_symlink_data_buffer *sym,
-                                u32 plen, bool unicode,
+                                u32 plen,
                                 struct cifs_sb_info *cifs_sb,
                                 const char *full_path,
                                 struct cifs_open_info_data *data)
@@ -641,7 +639,6 @@ static int parse_reparse_symlink(struct reparse_symlink_data_buffer *sym,
        return smb2_parse_native_symlink(&data->symlink_target,
                                         sym->PathBuffer + offs,
                                         len,
-                                        unicode,
                                         le32_to_cpu(sym->Flags) & SYMLINK_FLAG_RELATIVE,
                                         full_path,
                                         cifs_sb);
@@ -696,7 +693,7 @@ static int parse_reparse_wsl_symlink(struct reparse_wsl_symlink_data_buffer *buf
 int parse_reparse_point(struct reparse_data_buffer *buf,
                        u32 plen, struct cifs_sb_info *cifs_sb,
                        const char *full_path,
-                       bool unicode, struct cifs_open_info_data *data)
+                       struct cifs_open_info_data *data)
 {
        struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
 
@@ -710,7 +707,7 @@ int parse_reparse_point(struct reparse_data_buffer *buf,
        case IO_REPARSE_TAG_SYMLINK:
                return parse_reparse_symlink(
                        (struct reparse_symlink_data_buffer *)buf,
-                       plen, unicode, cifs_sb, full_path, data);
+                       plen, cifs_sb, full_path, data);
        case IO_REPARSE_TAG_LX_SYMLINK:
                return parse_reparse_wsl_symlink(
                        (struct reparse_wsl_symlink_data_buffer *)buf,
@@ -744,7 +741,7 @@ int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb,
 
        buf = (struct reparse_data_buffer *)((u8 *)io +
                                             le32_to_cpu(io->OutputOffset));
-       return parse_reparse_point(buf, plen, cifs_sb, full_path, true, data);
+       return parse_reparse_point(buf, plen, cifs_sb, full_path, data);
 }
 
 static bool wsl_to_fattr(struct cifs_open_info_data *data,

diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c
index 749a83cd0deb0830496d92232799821c49735a90..55014c22f08283ad02b25768ba0d27d90b123bba 100644 (file)
--- a/fs/smb/client/smb1ops.c
+++ b/fs/smb/client/smb1ops.c
@@ -1010,7 +1010,7 @@ static int cifs_parse_reparse_point(struct cifs_sb_info *cifs_sb,
 
        buf = (struct reparse_data_buffer *)((__u8 *)&io->hdr.Protocol +
                                             le32_to_cpu(io->DataOffset));
-       return parse_reparse_point(buf, plen, cifs_sb, full_path, true, data);
+       return parse_reparse_point(buf, plen, cifs_sb, full_path, data);
 }
 
 static bool

diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c
index 9ec44eab8dbca7ccc976b78a3ac8eb8abdaeed40..c5e689b2fc4973f522163b4c77c6725326193135 100644 (file)
--- a/fs/smb/client/smb2file.c
+++ b/fs/smb/client/smb2file.c
@@ -89,7 +89,6 @@ int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct kvec
        return smb2_parse_native_symlink(path,
                                         (char *)sym->PathBuffer + sub_offs,
                                         sub_len,
-                                        true,
                                         le32_to_cpu(sym->Flags) & SYMLINK_FLAG_RELATIVE,
                                         full_path,
                                         cifs_sb);

diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h
index 09349fa8da039aff8412c5090a9b242a58226025..10f5e37d153092e98abe74443865ad3693dfab01 100644 (file)
--- a/fs/smb/client/smb2proto.h
+++ b/fs/smb/client/smb2proto.h
@@ -112,7 +112,7 @@ extern int smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
                          const unsigned char *path, char *pbuf,
                          unsigned int *pbytes_read);
 int smb2_parse_native_symlink(char **target, const char *buf, unsigned int len,
-                             bool unicode, bool relative,
+                             bool relative,
                              const char *full_path,
                              struct cifs_sb_info *cifs_sb);
 int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb,