diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 2 | ||||
-rw-r--r-- | mm/mempolicy.c | 2 | ||||
-rw-r--r-- | mm/swapfile.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mm/memory.c b/mm/memory.c index 55b97ef6de11..ce3c9e4492d8 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -2726,7 +2726,7 @@ void print_vma_addr(char *prefix, unsigned long ip) | |||
2726 | if (buf) { | 2726 | if (buf) { |
2727 | char *p, *s; | 2727 | char *p, *s; |
2728 | 2728 | ||
2729 | p = d_path(f->f_dentry, f->f_vfsmnt, buf, PAGE_SIZE); | 2729 | p = d_path(&f->f_path, buf, PAGE_SIZE); |
2730 | if (IS_ERR(p)) | 2730 | if (IS_ERR(p)) |
2731 | p = "?"; | 2731 | p = "?"; |
2732 | s = strrchr(p, '/'); | 2732 | s = strrchr(p, '/'); |
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 8d246c3b340f..6c7ba1a63d23 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -1996,7 +1996,7 @@ int show_numa_map(struct seq_file *m, void *v) | |||
1996 | 1996 | ||
1997 | if (file) { | 1997 | if (file) { |
1998 | seq_printf(m, " file="); | 1998 | seq_printf(m, " file="); |
1999 | seq_path(m, file->f_path.mnt, file->f_path.dentry, "\n\t= "); | 1999 | seq_path(m, &file->f_path, "\n\t= "); |
2000 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { | 2000 | } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { |
2001 | seq_printf(m, " heap"); | 2001 | seq_printf(m, " heap"); |
2002 | } else if (vma->vm_start <= mm->start_stack && | 2002 | } else if (vma->vm_start <= mm->start_stack && |
diff --git a/mm/swapfile.c b/mm/swapfile.c index 02ccab5ad9d9..2da149cfc9ac 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
@@ -1394,7 +1394,7 @@ static int swap_show(struct seq_file *swap, void *v) | |||
1394 | } | 1394 | } |
1395 | 1395 | ||
1396 | file = ptr->swap_file; | 1396 | file = ptr->swap_file; |
1397 | len = seq_path(swap, file->f_path.mnt, file->f_path.dentry, " \t\n\\"); | 1397 | len = seq_path(swap, &file->f_path, " \t\n\\"); |
1398 | seq_printf(swap, "%*s%s\t%u\t%u\t%d\n", | 1398 | seq_printf(swap, "%*s%s\t%u\t%u\t%d\n", |
1399 | len < 40 ? 40 - len : 1, " ", | 1399 | len < 40 ? 40 - len : 1, " ", |
1400 | S_ISBLK(file->f_path.dentry->d_inode->i_mode) ? | 1400 | S_ISBLK(file->f_path.dentry->d_inode->i_mode) ? |