diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-07-04 08:54:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-04 08:54:08 -0700 |
| commit | 88cc0d3e8fc80880372e6900712a6f3f8172286a (patch) | |
| tree | 6d679acafdb47c29265a457127eee99856a3ba13 /fs/proc/array.c | |
| parent | c9add9b811a80322afe4388aa012ff431d41e0cf (diff) | |
[PATCH] ->i_dev switched to dev_t
* ->i_dev followed the example of ->s_dev - it's dev_t now. All
remaining uses of ->i_dev either outright want dev_t (stat()) or couldn't
care less (printing major:minor in /proc/<pid>/maps, etc.)
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index ff74e5098ea7..218e20e62701 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -538,11 +538,11 @@ int proc_pid_statm(struct task_struct *task, char * buffer) * + (index into the line) */ /* for systems with sizeof(void*) == 4: */ -#define MAPS_LINE_FORMAT4 "%08lx-%08lx %s %08lx %s %lu" +#define MAPS_LINE_FORMAT4 "%08lx-%08lx %s %08lx %02x:%02x %lu" #define MAPS_LINE_MAX4 49 /* sum of 8 1 8 1 4 1 8 1 5 1 10 1 */ /* for systems with sizeof(void*) == 8: */ -#define MAPS_LINE_FORMAT8 "%016lx-%016lx %s %016lx %s %lu" +#define MAPS_LINE_FORMAT8 "%016lx-%016lx %s %016lx %02x:%02x %lu" #define MAPS_LINE_MAX8 73 /* sum of 16 1 16 1 4 1 16 1 5 1 10 1 */ #define MAPS_LINE_FORMAT (sizeof(void*) == 4 ? MAPS_LINE_FORMAT4 : MAPS_LINE_FORMAT8) @@ -554,7 +554,7 @@ static int proc_pid_maps_get_line (char *buf, struct vm_area_struct *map) char *line; char str[5]; int flags; - kdev_t dev; + dev_t dev; unsigned long ino; int len; @@ -566,7 +566,7 @@ static int proc_pid_maps_get_line (char *buf, struct vm_area_struct *map) str[3] = flags & VM_MAYSHARE ? 's' : 'p'; str[4] = 0; - dev = NODEV; + dev = 0; ino = 0; if (map->vm_file != NULL) { dev = map->vm_file->f_dentry->d_inode->i_dev; @@ -584,7 +584,7 @@ static int proc_pid_maps_get_line (char *buf, struct vm_area_struct *map) len = sprintf(line, MAPS_LINE_FORMAT, map->vm_start, map->vm_end, str, map->vm_pgoff << PAGE_SHIFT, - kdevname(dev), ino); + MAJOR(dev), MINOR(dev), ino); if(map->vm_file) { int i; |