Merge branch 'work.sendmsg' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / block / ioprio.c

diff --git a/block/ioprio.c b/block/ioprio.c
index 01b8116298a13b5463e7969ce66c0b037bcfccd5..3790669232ff5066175a2033ebd418a7c5a83f53 100644 (file)
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -122,14 +122,14 @@ SYSCALL_DEFINE3(ioprio_set, int, which, int, who, int, ioprio)
                        if (!user)
                                break;
 
-                       do_each_thread(g, p) {
+                       for_each_process_thread(g, p) {
                                if (!uid_eq(task_uid(p), uid) ||
                                    !task_pid_vnr(p))
                                        continue;
                                ret = set_task_ioprio(p, ioprio);
                                if (ret)
                                        goto free_uid;
-                       } while_each_thread(g, p);
+                       }
 free_uid:
                        if (who)
                                free_uid(user);
@@ -222,7 +222,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
                        if (!user)
                                break;
 
-                       do_each_thread(g, p) {
+                       for_each_process_thread(g, p) {
                                if (!uid_eq(task_uid(p), user->uid) ||
                                    !task_pid_vnr(p))
                                        continue;
@@ -233,7 +233,7 @@ SYSCALL_DEFINE2(ioprio_get, int, which, int, who)
                                        ret = tmpio;
                                else
                                        ret = ioprio_best(ret, tmpio);
-                       } while_each_thread(g, p);
+                       }
 
                        if (who)
                                free_uid(user);