Messages in this thread Patch in this message | | | Date | Fri, 3 Apr 2009 10:25:34 +0900 | From | KAMEZAWA Hiroyuki <> | Subject | [PATCH] proc pid maps dont show pgoff of pure anon vmas style fix (WasRe: [RFC][PATCH] don't show pgoff of vma if vma is pure ANON (was Re: mmotm 2009-01-12-16-53 uploaded) |
| |
I wrote this on mmotm-Mar23 as 2.6.29-rc8-mm1. Is this ok ? == From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Fix condig style of proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas.patch
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> --- fs/proc/task_mmu.c | 5 +++-- fs/proc/task_nommu.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
Index: mmotm-2.6.29-rc8-mm1/fs/proc/task_mmu.c =================================================================== --- mmotm-2.6.29-rc8-mm1.orig/fs/proc/task_mmu.c +++ mmotm-2.6.29-rc8-mm1/fs/proc/task_mmu.c @@ -204,6 +204,7 @@ static void show_map_vma(struct seq_file struct file *file = vma->vm_file; int flags = vma->vm_flags; unsigned long ino = 0; + unsigned long long pgoff = 0; dev_t dev = 0; int len; @@ -211,6 +212,7 @@ static void show_map_vma(struct seq_file struct inode *inode = vma->vm_file->f_path.dentry->d_inode; dev = inode->i_sb->s_dev; ino = inode->i_ino; + pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; } seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", @@ -220,8 +222,7 @@ static void show_map_vma(struct seq_file flags & VM_WRITE ? 'w' : '-', flags & VM_EXEC ? 'x' : '-', flags & VM_MAYSHARE ? 's' : 'p', - (!vma->vm_file) ? 0 : - ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, + pgoff, MAJOR(dev), MINOR(dev), ino, &len); /* Index: mmotm-2.6.29-rc8-mm1/fs/proc/task_nommu.c =================================================================== --- mmotm-2.6.29-rc8-mm1.orig/fs/proc/task_nommu.c +++ mmotm-2.6.29-rc8-mm1/fs/proc/task_nommu.c @@ -125,6 +125,7 @@ static int nommu_vma_show(struct seq_fil struct file *file; dev_t dev = 0; int flags, len; + unsigned long long pgoff = 0; flags = vma->vm_flags; file = vma->vm_file; @@ -133,6 +134,7 @@ static int nommu_vma_show(struct seq_fil struct inode *inode = vma->vm_file->f_path.dentry->d_inode; dev = inode->i_sb->s_dev; ino = inode->i_ino; + pgoff = (loff_t)vma->pg_off << PAGE_SHIFT; } seq_printf(m, @@ -143,8 +145,7 @@ static int nommu_vma_show(struct seq_fil flags & VM_WRITE ? 'w' : '-', flags & VM_EXEC ? 'x' : '-', flags & VM_MAYSHARE ? flags & VM_SHARED ? 'S' : 's' : 'p', - (!vma->vm_file) ? 0 : - (unsigned long long) vma->vm_pgoff << PAGE_SHIFT, + pgoff, MAJOR(dev), MINOR(dev), ino, &len); if (file) {
| |