seq_file: drop unused *_escape_mem_ascii()

There are no more users of the seq_escape_mem_ascii() followed by
string_escape_mem_ascii().

Remove them for good.

Link: https://lkml.kernel.org/r/20210504180819.73127-16-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 08f54029c2b17fc116f73a094a7fad28f8d3c775..b117b212ef2887eca0f3c2412f761228740fb81d 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -396,17 +396,6 @@ void seq_escape(struct seq_file *m, const char *s, const char *esc)
 }
 EXPORT_SYMBOL(seq_escape);
 
-void seq_escape_mem_ascii(struct seq_file *m, const char *src, size_t isz)
-{
-       char *buf;
-       size_t size = seq_get_buf(m, &buf);
-       int ret;
-
-       ret = string_escape_mem_ascii(src, isz, buf, size);
-       seq_commit(m, ret < size ? ret : -1);
-}
-EXPORT_SYMBOL(seq_escape_mem_ascii);
-
 void seq_vprintf(struct seq_file *m, const char *f, va_list args)
 {
        int len;

diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 63f021cb1b12e010d24d6f29d6f8ec07e84a3ec1..dd99569595fd3c15edb0db11ec514ade619176e2 100644 (file)
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -136,7 +136,6 @@ static inline void seq_escape_str(struct seq_file *m, const char *src,
 }
 
 void seq_escape(struct seq_file *m, const char *s, const char *esc);
-void seq_escape_mem_ascii(struct seq_file *m, const char *src, size_t isz);
 
 void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
                  int rowsize, int groupsize, const void *buf, size_t len,

diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 9b0eca2badf2ed2a538d87835e15ecc969e8abde..68189c4a2eb11fec5e12c196b9b761f41dc1aede 100644 (file)
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -63,9 +63,6 @@ static inline int string_unescape_any_inplace(char *buf)
 int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
                unsigned int flags, const char *only);
 
-int string_escape_mem_ascii(const char *src, size_t isz, char *dst,
-                                       size_t osz);
-
 static inline int string_escape_mem_any_np(const char *src, size_t isz,
                char *dst, size_t osz, const char *only)
 {

diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index c15aea7a82e97f56aa263e81370f283ecc856b88..5a35c7e16e96cc706903ec9afac1591ef6af81cc 100644 (file)
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -582,25 +582,6 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
 }
 EXPORT_SYMBOL(string_escape_mem);
 
-int string_escape_mem_ascii(const char *src, size_t isz, char *dst,
-                                       size_t osz)
-{
-       char *p = dst;
-       char *end = p + osz;
-
-       while (isz--) {
-               unsigned char c = *src++;
-
-               if (!isprint(c) || !isascii(c) || c == '"' || c == '\\')
-                       escape_hex(c, &p, end);
-               else
-                       escape_passthrough(c, &p, end);
-       }
-
-       return p - dst;
-}
-EXPORT_SYMBOL(string_escape_mem_ascii);
-
 /*
  * Return an allocated string that has been escaped of special characters
  * and double quotes, making it safe to log in quotes.