seq_file: rename mangle_path to seq_mangle_path
Subsystems (2)
PATCH 1/1 seq_file: rename mangle_path to seq_mangle_path
From: Johannes Berg <[email protected]>
The symbol mangle_path conflicts with a gcov symbol which can break the build of ARCH=um with gcov, and it's also not very specific and descriptive.
Rename mangle_path() to seq_mangle_path(), and also remove the export since it's not needed or used by any modules.
---
This is a revived patch. The original can be found at
https://lkml.iu.edu/hypermail/linux/kernel/2103.1/06604.html
fs/seq_file.c | 11 +++++------ include/linux/seq_file.h | 2 +- lib/seq_buf.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-)
fs/seq_file.c +5 -6
@@ -428,7 +428,7 @@ EXPORT_SYMBOL(seq_bprintf);#endif /* CONFIG_BINARY_PRINTF */ /** -* mangle_path - mangle and copy path to buffer beginning +* seq_mangle_path - mangle and copy path to buffer beginning * @s: buffer start * @p: beginning of path in above buffer * @esc: set of characters that need escaping
@@ -438,7 +438,7 @@ EXPORT_SYMBOL(seq_bprintf);* Returns pointer past last written character in @s, or NULL in case of * failure. */ -char *mangle_path (char *s,const char *p,const char *esc) +char *seq_mangle_path (char *s,const char *p,const char *esc) {while (s <= p) {char c = *p++;
@@ -457,7 +457,6 @@ char *mangle_path(char *s, const char *p, const char *esc) }return NULL ; } -EXPORT_SYMBOL (mangle_path);/** * seq_path - seq_file interface to print a pathname
@@ -477,7 +476,7 @@ int seq_path(struct seq_file *m, const struct path *path, const char *esc)if (size) {char *p =d_path (path, buf, size);if (!IS_ERR (p)) { -char *end =mangle_path (buf, p, esc); +char *end =seq_mangle_path (buf, p, esc);if (end) res = end - buf; }
@@ -520,7 +519,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,return SEQ_SKIP ; res =PTR_ERR (p);if (!IS_ERR (p)) { -char *end =mangle_path (buf, p, esc); +char *end =seq_mangle_path (buf, p, esc);if (end) res = end - buf;else
@@ -544,7 +543,7 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, const char *esc)if (size) {char *p =dentry_path (dentry, buf, size);if (!IS_ERR (p)) { -char *end =mangle_path (buf, p, esc); +char *end =seq_mangle_path (buf, p, esc);if (end) res = end - buf; }
include/linux/seq_file.h +1 -1
@@ -104,7 +104,7 @@ static inline void seq_setwidth(struct seq_file *m, size_t size) }void seq_pad (struct seq_file *m,char c); -char *mangle_path (char *s,const char *p,const char *esc); +char *seq_mangle_path (char *s,const char *p,const char *esc);int seq_open (struct file *,const struct seq_operations *);ssize_t seq_read (struct file *,char __user *,size_t ,loff_t *);ssize_t seq_read_iter (struct kiocb *iocb,struct iov_iter *iter);
lib/seq_buf.c +1 -1
@@ -320,7 +320,7 @@ int seq_buf_path(struct seq_buf *s, const struct path *path, const char *esc)if (size) {char *p =d_path (path, buf, size);if (!IS_ERR (p)) { -char *end =mangle_path (buf, p, esc); +char *end =seq_mangle_path (buf, p, esc);if (end) res = end - buf; }
--
2.43.0
Quoted 1 line · Alex Hung
seq_file: renamemangle_pathtoseq_mangle_path
Seems fine.
---
Applied to the vfs-7.3.misc branch of the vfs/vfs.git tree. Patches in the vfs-7.3.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-7.3.misc
[1/1] seq_file: rename mangle_path to seq_mangle_path
https://git.kernel.org/vfs/vfs/c/b70cb1ebbf87