pid namespaces: round up the API

The set of functions process_session, task_session, process_group and
task_pgrp is confusing, as the names can be mixed with each other when looking
at the code for a long time.

The proposals are to
* equip the functions that return the integer with _nr suffix to
  represent that fact,
* and to make all functions work with task (not process) by making
  the common prefix of the same name.

For monotony the routines signal_session() and set_signal_session() are
replaced with task_session_nr() and set_task_session(), especially since they
are only used with the explicit task->signal dereference.

Signed-off-by: Pavel Emelianov <xemul@openvz.org>
Acked-by: Serge E. Hallyn <serue@us.ibm.com>
Cc: Kirill Korotaev <dev@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

9 files changed, 19 insertions, 19 deletions

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index e7204d71acc9..45f5992a0957 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -80,7 +80,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
 
         *uid = current->uid;
         *gid = current->gid;
-        *pgrp = process_group(current);
+        *pgrp = task_pgrp_nr(current);
 
         *minproto = *maxproto = AUTOFS_PROTO_VERSION;
 
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index c1489533277a..592f64037ae2 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -215,7 +215,7 @@ static struct dentry *autofs_root_lookup(struct inode *dir, struct dentry *dentr
         oz_mode = autofs_oz_mode(sbi);
         DPRINTK(("autofs_lookup: pid = %u, pgrp = %u, catatonic = %d, "
                                 "oz_mode = %d\n", pid_nr(task_pid(current)),
-                                process_group(current), sbi->catatonic,
+                                task_pgrp_nr(current), sbi->catatonic,
                                 oz_mode));
 
         /*
@@ -536,7 +536,7 @@ static int autofs_root_ioctl(struct inode *inode, struct file *filp,
         struct autofs_sb_info *sbi = autofs_sbi(inode->i_sb);
         void __user *argp = (void __user *)arg;
 
-        DPRINTK(("autofs_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",cmd,arg,sbi,process_group(current)));
+        DPRINTK(("autofs_ioctl: cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u\n",cmd,arg,sbi,task_pgrp_nr(current)));
 
         if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
              _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
index d85f42fa9206..2d4ae40718d9 100644
--- a/fs/autofs4/autofs_i.h
+++ b/fs/autofs4/autofs_i.h
@@ -131,7 +131,7 @@ static inline struct autofs_info *autofs4_dentry_ino(struct dentry *dentry)
    filesystem without "magic".) */
 
 static inline int autofs4_oz_mode(struct autofs_sb_info *sbi) {
-        return sbi->catatonic || process_group(current) == sbi->oz_pgrp;
+        return sbi->catatonic || task_pgrp_nr(current) == sbi->oz_pgrp;
 }
 
 /* Does a dentry have some pending activity? */
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index cd81f0836671..7f05d6ccdb13 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -226,7 +226,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
 
         *uid = current->uid;
         *gid = current->gid;
-        *pgrp = process_group(current);
+        *pgrp = task_pgrp_nr(current);
 
         *minproto = AUTOFS_MIN_PROTO_VERSION;
         *maxproto = AUTOFS_MAX_PROTO_VERSION;
@@ -323,7 +323,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
         sbi->pipe = NULL;
         sbi->catatonic = 1;
         sbi->exp_timeout = 0;
-        sbi->oz_pgrp = process_group(current);
+        sbi->oz_pgrp = task_pgrp_nr(current);
         sbi->sb = s;
         sbi->version = 0;
         sbi->sub_version = 0;
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index 45ff3d63b758..2bbcc8151dc3 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -582,7 +582,7 @@ static struct dentry *autofs4_lookup(struct inode *dir, struct dentry *dentry, s
         oz_mode = autofs4_oz_mode(sbi);
 
         DPRINTK("pid = %u, pgrp = %u, catatonic = %d, oz_mode = %d",
-                 current->pid, process_group(current), sbi->catatonic, oz_mode);
+                 current->pid, task_pgrp_nr(current), sbi->catatonic, oz_mode);
 
         unhashed = autofs4_lookup_unhashed(sbi, dentry->d_parent, &dentry->d_name);
         if (!unhashed) {
@@ -976,7 +976,7 @@ static int autofs4_root_ioctl(struct inode *inode, struct file *filp,
         void __user *p = (void __user *)arg;
 
         DPRINTK("cmd = 0x%08x, arg = 0x%08lx, sbi = %p, pgrp = %u",
-                cmd,arg,sbi,process_group(current));
+                cmd,arg,sbi,task_pgrp_nr(current));
 
         if (_IOC_TYPE(cmd) != _IOC_TYPE(AUTOFS_IOC_FIRST) ||
              _IOC_NR(cmd) - _IOC_NR(AUTOFS_IOC_FIRST) >= AUTOFS_IOC_COUNT)
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 6e2f3b8dde7f..9ea2b99dc31a 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1385,8 +1385,8 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
         prstatus->pr_sighold = p->blocked.sig[0];
         prstatus->pr_pid = p->pid;
         prstatus->pr_ppid = p->parent->pid;
-        prstatus->pr_pgrp = process_group(p);
-        prstatus->pr_sid = process_session(p);
+        prstatus->pr_pgrp = task_pgrp_nr(p);
+        prstatus->pr_sid = task_session_nr(p);
         if (thread_group_leader(p)) {
                 /*
                  * This is the record for the group leader.  Add in the
@@ -1431,8 +1431,8 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
 
         psinfo->pr_pid = p->pid;
         psinfo->pr_ppid = p->parent->pid;
-        psinfo->pr_pgrp = process_group(p);
-        psinfo->pr_sid = process_session(p);
+        psinfo->pr_pgrp = task_pgrp_nr(p);
+        psinfo->pr_sid = task_session_nr(p);
 
         i = p->state ? ffz(~p->state) + 1 : 0;
         psinfo->pr_state = i;
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 033861c6b8f1..b8b4e93f6f62 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1344,8 +1344,8 @@ static void fill_prstatus(struct elf_prstatus *prstatus,
         prstatus->pr_sighold = p->blocked.sig[0];
         prstatus->pr_pid = p->pid;
         prstatus->pr_ppid = p->parent->pid;
-        prstatus->pr_pgrp = process_group(p);
-        prstatus->pr_sid = process_session(p);
+        prstatus->pr_pgrp = task_pgrp_nr(p);
+        prstatus->pr_sid = task_session_nr(p);
         if (thread_group_leader(p)) {
                 /*
                  * This is the record for the group leader.  Add in the
@@ -1393,8 +1393,8 @@ static int fill_psinfo(struct elf_prpsinfo *psinfo, struct task_struct *p,
 
         psinfo->pr_pid = p->pid;
         psinfo->pr_ppid = p->parent->pid;
-        psinfo->pr_pgrp = process_group(p);
-        psinfo->pr_sid = process_session(p);
+        psinfo->pr_pgrp = task_pgrp_nr(p);
+        psinfo->pr_sid = task_session_nr(p);
 
         i = p->state ? ffz(~p->state) + 1 : 0;
         psinfo->pr_state = i;
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c
index cdb4c07a7870..359e531094dd 100644
--- a/fs/coda/upcall.c
+++ b/fs/coda/upcall.c
@@ -51,7 +51,7 @@ static void *alloc_upcall(int opcode, int size)
 
         inp->ih.opcode = opcode;
         inp->ih.pid = current->pid;
-        inp->ih.pgid = process_group(current);
+        inp->ih.pgid = task_pgrp_nr(current);
 #ifdef CONFIG_CODA_FS_OLD_API
         memset(&inp->ih.cred, 0, sizeof(struct coda_cred));
         inp->ih.cred.cr_fsuid = current->fsuid;
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 27b59f5f3bd1..24f7f9f6684d 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -449,8 +449,8 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                         gtime += cputime_add(gtime, sig->gtime);
                 }
 
-                sid = signal_session(sig);
-                pgid = process_group(task);
+                sid = task_session_nr(task);
+                pgid = task_pgrp_nr(task);
                 ppid = rcu_dereference(task->real_parent)->tgid;
 
                 unlock_task_sighand(task, &flags);