vfs: add file_path() helper

Turn
	d_path(&file->f_path, ...);
into
	file_path(file, ...);

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index e00a018..9f80c5a 100644 (file)
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -67,15 +67,12 @@ static void print_task_path_n_nm(struct task_struct *tsk, char *buf)
        mmput(mm);
 
        if (exe_file) {
-               path = exe_file->f_path;
-               path_get(&exe_file->f_path);
+               path_nm = file_path(exe_file, buf, 255);
                fput(exe_file);
-               path_nm = d_path(&path, buf, 255);
-               path_put(&path);
        }
 
 done:
-       pr_info("Path: %s\n", path_nm);
+       pr_info("Path: %s\n", !IS_ERR(path_nm) ? path_nm : "?");
 }
 
 static void show_faulting_vma(unsigned long address, char *buf)
@@ -99,8 +96,7 @@ static void show_faulting_vma(unsigned long address, char *buf)
        if (vma && (vma->vm_start <= address)) {
                struct file *file = vma->vm_file;
                if (file) {
-                       struct path *path = &file->f_path;
-                       nm = d_path(path, buf, PAGE_SIZE - 1);
+                       nm = file_path(file, buf, PAGE_SIZE - 1);
                        inode = file_inode(vma->vm_file);
                        dev = inode->i_sb->s_dev;
                        ino = inode->i_ino;

diff --cc arch/blackfin/kernel/trace.c
Simple merge

diff --cc arch/tile/kernel/stack.c
Simple merge

diff --cc arch/tile/mm/elf.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/md/bitmap.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/usb/gadget/function/f_mass_storage.c
Simple merge

diff --cc drivers/usb/gadget/function/storage_common.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc fs/coredump.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc mm/memory.c
Simple merge