cifsd: uniquify extract_sharename()

uniquify extract_sharename().

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifsd/misc.c b/fs/cifsd/misc.c
index 9e689c33f7bb5d2c73117468ee679100f3115868..68983b08d519ecf7fb815276f2b90a7dbe95b8a1 100644 (file)
--- a/fs/cifsd/misc.c
+++ b/fs/cifsd/misc.c
@@ -210,12 +210,12 @@ void ksmbd_conv_path_to_windows(char *path)
 }
 
 /**
- * extract_sharename() - get share name from tree connect request
+ * ksmbd_extract_sharename() - get share name from tree connect request
  * @treename:  buffer containing tree name and share name
  *
  * Return:      share name on success, otherwise error
  */
-char *extract_sharename(char *treename)
+char *ksmbd_extract_sharename(char *treename)
 {
        char *name = treename;
        char *dst;

diff --git a/fs/cifsd/misc.h b/fs/cifsd/misc.h
index d67843aad5091302124de78821576b7bed4a6bfc..41b3dac2f5fc553371f2c33cf874d8802559bc18 100644 (file)
--- a/fs/cifsd/misc.h
+++ b/fs/cifsd/misc.h
@@ -25,7 +25,7 @@ void ksmbd_conv_path_to_unix(char *path);
 void ksmbd_strip_last_slash(char *path);
 void ksmbd_conv_path_to_windows(char *path);
 
-char *extract_sharename(char *treename);
+char *ksmbd_extract_sharename(char *treename);
 
 char *convert_to_unix_name(struct ksmbd_share_config *share, char *name);
 

diff --git a/fs/cifsd/smb2pdu.c b/fs/cifsd/smb2pdu.c
index b20cc07ee809e6be227c1391c961dc7aa8037224..a4e78ebb077350145e96f57511ac456d7da11624 100644 (file)
--- a/fs/cifsd/smb2pdu.c
+++ b/fs/cifsd/smb2pdu.c
@@ -1709,7 +1709,7 @@ int smb2_tree_connect(struct ksmbd_work *work)
                goto out_err1;
        }
 
-       name = extract_sharename(treename);
+       name = ksmbd_extract_sharename(treename);
        if (IS_ERR(name)) {
                status.ret = KSMBD_TREE_CONN_STATUS_ERROR;
                goto out_err1;

diff --git a/fs/cifsd/unicode.h b/fs/cifsd/unicode.h
index 228a02c9b95d7d5fc37ff5e0d3a3e44c9435117b..7135d62bf9b074f252634413de238205f97c9cba 100644 (file)
--- a/fs/cifsd/unicode.h
+++ b/fs/cifsd/unicode.h
@@ -69,7 +69,7 @@ char *smb_strndup_from_utf16(const char *src, const int maxlen,
                const struct nls_table *codepage);
 extern int smbConvertToUTF16(__le16 *target, const char *source, int srclen,
                const struct nls_table *cp, int mapchars);
-extern char *extract_sharename(char *treename);
+extern char *ksmbd_extract_sharename(char *treename);
 #endif
 
 wchar_t cifs_toupper(wchar_t in);