cifs: Make extract_sharename function public

Move the function to misc.c

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/cache.c b/fs/cifs/cache.c
index 0f2adecb94f22473c0e9af3952f5716fd5ef5624..488fe0ffc1ef692b48d1ce7660b6555d73bbdc83 100644 (file)
--- a/fs/cifs/cache.c
+++ b/fs/cifs/cache.c
@@ -53,30 +53,6 @@ const struct fscache_cookie_def cifs_fscache_server_index_def = {
        .type = FSCACHE_COOKIE_TYPE_INDEX,
 };
 
-char *extract_sharename(const char *treename)
-{
-       const char *src;
-       char *delim, *dst;
-       int len;
-
-       /* skip double chars at the beginning */
-       src = treename + 2;
-
-       /* share name is always preceded by '\\' now */
-       delim = strchr(src, '\\');
-       if (!delim)
-               return ERR_PTR(-EINVAL);
-       delim++;
-       len = strlen(delim);
-
-       /* caller has to free the memory */
-       dst = kstrndup(delim, len, GFP_KERNEL);
-       if (!dst)
-               return ERR_PTR(-ENOMEM);
-
-       return dst;
-}
-
 static enum
 fscache_checkaux cifs_fscache_super_check_aux(void *cookie_netfs_data,
                                              const void *data,

diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index 3fe0c4a0d36d2cd8e90dd25ce3f68fbc0cac9cb1..b80b57a668040285dbd642c6c9265e1b984c8a62 100644 (file)
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -618,6 +618,7 @@ struct super_block *cifs_get_tcp_super(struct TCP_Server_Info *server);
 void cifs_put_tcp_super(struct super_block *sb);
 int update_super_prepath(struct cifs_tcon *tcon, char *prefix);
 char *extract_hostname(const char *unc);
+char *extract_sharename(const char *unc);
 
 #ifdef CONFIG_CIFS_DFS_UPCALL
 static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses,

diff --git a/fs/cifs/fscache.c b/fs/cifs/fscache.c
index da688185403c3ee2550590e37c7bc6ff82d50f99..20d24af33ee2976608b50767210d7ce7fc56416d 100644 (file)
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
@@ -22,6 +22,7 @@
 #include "cifsglob.h"
 #include "cifs_debug.h"
 #include "cifs_fs_sb.h"
+#include "cifsproto.h"
 
 /*
  * Key layout of CIFS server cache index object

diff --git a/fs/cifs/fscache.h b/fs/cifs/fscache.h
index 1091633d2adbd2aed356c653d052e96d4b4268ef..e811f2dd76191cdb8afe0537183fc754e29f5329 100644 (file)
--- a/fs/cifs/fscache.h
+++ b/fs/cifs/fscache.h
@@ -57,7 +57,6 @@ extern const struct fscache_cookie_def cifs_fscache_inode_object_def;
 
 extern int cifs_fscache_register(void);
 extern void cifs_fscache_unregister(void);
-extern char *extract_sharename(const char *);
 
 /*
  * fscache.c

diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
index 3d5cc25c167f5d87ca6c14a4e95aed42b85420a9..f0a1c24751b21a68d95e234ec02f52f6e420c693 100644 (file)
--- a/fs/cifs/misc.c
+++ b/fs/cifs/misc.c
@@ -1227,3 +1227,27 @@ char *extract_hostname(const char *unc)
 
        return dst;
 }
+
+char *extract_sharename(const char *unc)
+{
+       const char *src;
+       char *delim, *dst;
+       int len;
+
+       /* skip double chars at the beginning */
+       src = unc + 2;
+
+       /* share name is always preceded by '\\' now */
+       delim = strchr(src, '\\');
+       if (!delim)
+               return ERR_PTR(-EINVAL);
+       delim++;
+       len = strlen(delim);
+
+       /* caller has to free the memory */
+       dst = kstrndup(delim, len, GFP_KERNEL);
+       if (!dst)
+               return ERR_PTR(-ENOMEM);
+
+       return dst;
+}