renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 08:44:14 +08:00
Code

vfs: add seq_file_path() helper

Browse Source 
Turn
	seq_path(..., &file->f_path, ...);
into
	seq_file_path(..., file, ...);

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2015-06-19 10:30:28 +02:00 committed by Al Viro
parent 9bf39ab2ad
commit 2726d56620
7 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/bitmap.c
View File

@ -1922,7 +1922,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
chunk_kb ? "KB" : "B"); chunk_kb ? "KB" : "B");
if (bitmap->storage.file) { if (bitmap->storage.file) {
seq_printf(seq, ", file: "); seq_printf(seq, ", file: ");
seq_path(seq, &bitmap->storage.file->f_path, " \t\n"); seq_file_path(seq, bitmap->storage.file, " \t\n");
} }
seq_printf(seq, "\n"); seq_printf(seq, "\n");

2
fs/proc/nommu.c
View File

@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
if (file) { if (file) {
seq_pad(m, ' '); seq_pad(m, ' ');
seq_path(m, &file->f_path, ""); seq_file_path(m, file, "");
} }
seq_putc(m, '\n'); seq_putc(m, '\n');

4
fs/proc/task_mmu.c
View File

@ -310,7 +310,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
*/ */
if (file) { if (file) {
seq_pad(m, ' '); seq_pad(m, ' ');
seq_path(m, &file->f_path, "\n"); seq_file_path(m, file, "\n");
goto done; goto done;
} }
@ -1509,7 +1509,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
if (file) { if (file) {
seq_puts(m, " file="); seq_puts(m, " file=");
seq_path(m, &file->f_path, "\n\t= "); seq_file_path(m, file, "\n\t= ");
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
seq_puts(m, " heap"); seq_puts(m, " heap");
} else { } else {

2
fs/proc/task_nommu.c
View File

@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
if (file) { if (file) {
seq_pad(m, ' '); seq_pad(m, ' ');
seq_path(m, &file->f_path, ""); seq_file_path(m, file, "");
} else if (mm) { } else if (mm) {
pid_t tid = pid_of_stack(priv, vma, is_pid); pid_t tid = pid_of_stack(priv, vma, is_pid);

14
fs/seq_file.c
View File

@ -487,6 +487,20 @@ int seq_path(struct seq_file *m, const struct path *path, const char *esc)
} }
EXPORT_SYMBOL(seq_path); EXPORT_SYMBOL(seq_path);
/**
* seq_file_path - seq_file interface to print a pathname of a file
* @m: the seq_file handle
* @file: the struct file to print
* @esc: set of characters to escape in the output
*
* return the absolute path to the file.
*/
int seq_file_path(struct seq_file *m, struct file *file, const char *esc)
{
return seq_path(m, &file->f_path, esc);
}
EXPORT_SYMBOL(seq_file_path);
/* /*
* Same as seq_path, but relative to supplied root. * Same as seq_path, but relative to supplied root.
*/ */

1
include/linux/seq_file.h
View File

@ -123,6 +123,7 @@ __printf(2, 3) int seq_printf(struct seq_file *, const char *, ...);
__printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args); __printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args);
int seq_path(struct seq_file *, const struct path *, const char *); int seq_path(struct seq_file *, const struct path *, const char *);
int seq_file_path(struct seq_file *, struct file *, const char *);
int seq_dentry(struct seq_file *, struct dentry *, const char *); int seq_dentry(struct seq_file *, struct dentry *, const char *);
int seq_path_root(struct seq_file *m, const struct path *path, int seq_path_root(struct seq_file *m, const struct path *path,
const struct path *root, const char *esc); const struct path *root, const char *esc);

2
mm/swapfile.c
View File

@ -2032,7 +2032,7 @@ static int swap_show(struct seq_file *swap, void *v)
} }
file = si->swap_file; file = si->swap_file;
len = seq_path(swap, &file->f_path, " \t\n\\"); len = seq_file_path(swap, file, " \t\n\\");
seq_printf(swap, "%*s%s\t%u\t%u\t%d\n", seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
len < 40 ? 40 - len : 1, " ", len < 40 ? 40 - len : 1, " ",
S_ISBLK(file_inode(file)->i_mode) ? S_ISBLK(file_inode(file)->i_mode) ?