From 9d5fab503964c1fb814edf1f732c5ef5a9d9ac66 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Tue, 23 Sep 2003 09:07:14 -0700 Subject: [PATCH] [PATCH] 32-bit dev_t fixups Argh. A couple of places where we needed ..._encode_dev() had been lost in reordering the patchset - the most notable being ctty number in /proc//stat. Fix follows: --- arch/x86_64/ia32/ia32_ioctl.c | 2 +- fs/proc/array.c | 2 +- kernel/acct.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c index 4c1a4c2e67790..517da783c6169 100644 --- a/arch/x86_64/ia32/ia32_ioctl.c +++ b/arch/x86_64/ia32/ia32_ioctl.c @@ -35,7 +35,7 @@ static int tiocgdev(unsigned fd, unsigned cmd, unsigned int *ptr) real_tty = (struct tty_struct *)file->private_data; if (!real_tty) return -EINVAL; - return put_user(tty_devnum(real_tty), ptr); + return put_user(new_encode_dev(tty_devnum(real_tty)), ptr); } diff --git a/fs/proc/array.c b/fs/proc/array.c index f38e5d249fabb..1eba76a6f603b 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -306,7 +306,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer) mm = mmgrab(mm); if (task->tty) { tty_pgrp = task->tty->pgrp; - tty_nr = tty_devnum(task->tty); + tty_nr = new_encode_dev(tty_devnum(task->tty)); } task_unlock(task); if (mm) { diff --git a/kernel/acct.c b/kernel/acct.c index edb2ba573e70f..a679f4bb98542 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -340,9 +340,10 @@ static void do_acct_process(long exitcode, struct file *file) ac.ac_btime = xtime.tv_sec - elapsed; ac.ac_utime = encode_comp_t(current->utime); ac.ac_stime = encode_comp_t(current->stime); + /* we really need to bite the bullet and change layout */ ac.ac_uid = current->uid; ac.ac_gid = current->gid; - ac.ac_tty = current->tty ? tty_devnum(current->tty) : 0; + ac.ac_tty = current->tty ? old_encode_dev(tty_devnum(current->tty)) : 0; ac.ac_flag = 0; if (current->flags & PF_FORKNOEXEC) -- 2.53.0