1 files changed, 12 insertions, 6 deletions

diff --git a/fs/ioprio.c b/fs/ioprio.c
index 89e8da112a75..10d2c211d18b 100644
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
@@ -60,6 +60,7 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
         int data = IOPRIO_PRIO_DATA(ioprio);
         struct task_struct *p, *g;
         struct user_struct *user;
+        struct pid *pgrp;
         int ret;
 
         switch (class) {
@@ -98,12 +99,14 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
                         break;
                 case IOPRIO_WHO_PGRP:
                         if (!who)
-                                who = process_group(current);
-                        do_each_task_pid(who, PIDTYPE_PGID, p) {
+                                pgrp = task_pgrp(current);
+                        else
+                                pgrp = find_pid(who);
+                        do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
                                 ret = set_task_ioprio(p, ioprio);
                                 if (ret)
                                         break;
-                        } while_each_task_pid(who, PIDTYPE_PGID, p);
+                        } while_each_pid_task(pgrp, PIDTYPE_PGID, p);
                         break;
                 case IOPRIO_WHO_USER:
                         if (!who)
@@ -167,6 +170,7 @@ asmlinkage long sys_ioprio_get(int which, int who)
 {
         struct task_struct *g, *p;
         struct user_struct *user;
+        struct pid *pgrp;
         int ret = -ESRCH;
         int tmpio;
 
@@ -182,8 +186,10 @@ asmlinkage long sys_ioprio_get(int which, int who)
                         break;
                 case IOPRIO_WHO_PGRP:
                         if (!who)
-                                who = process_group(current);
-                        do_each_task_pid(who, PIDTYPE_PGID, p) {
+                                pgrp = task_pgrp(current);
+                        else
+                                pgrp = find_pid(who);
+                        do_each_pid_task(pgrp, PIDTYPE_PGID, p) {
                                 tmpio = get_task_ioprio(p);
                                 if (tmpio < 0)
                                         continue;
@@ -191,7 +197,7 @@ asmlinkage long sys_ioprio_get(int which, int who)
                                         ret = tmpio;
                                 else
                                         ret = ioprio_best(ret, tmpio);
-                        } while_each_task_pid(who, PIDTYPE_PGID, p);
+                        } while_each_pid_task(pgrp, PIDTYPE_PGID, p);
                         break;
                 case IOPRIO_WHO_USER:
                         if (!who)