commit 29b0a2e823e2b451e793b9cd891107d4daec3864
author Elliott Hughes <enh@google.com> Wed Jul 08 02:32:57 2015 -0500
committer Rob Landley <rob@landley.net> Wed Jul 08 02:32:57 2015 -0500
tree d84e74236ed1194c7274d2e4d447074b71213cfd
parent 3487bd353b4448bbdc9ece6d62fc4c4f4fd6ae4a

Fix ionice.

ioprio_set takes a "prio" argument that combines class and level. Although
bionic (via the uapi headers) includes the appropriate constants and even
a convenience macro, glibc doesn't, so just hard-code the encoding.

Also fix the sense of a conditional so we actually execute the provided
command.

toys/other/ionice.c

diff --git a/toys/other/ionice.c b/toys/other/ionice.c
index 82f8fde..e44270a 100644
--- a/toys/other/ionice.c
+++ b/toys/other/ionice.c
@@ -52,7 +52,9 @@
 
 static int ioprio_set(void)
 {
-  return syscall(__NR_ioprio_set, 1, (int)TT.pid, (int)TT.class, (int)TT.level);
+  int prio = ((int)TT.class << 13) | (int)TT.level;
+
+  return syscall(__NR_ioprio_set, 1, (int)TT.pid, prio);
 }
 
 void ionice_main(void)
@@ -65,7 +67,7 @@
       p&7);
   } else {
     if (-1 == ioprio_set() && !(toys.optflags&FLAG_t)) perror_exit("set");
-    if (TT.pid) xexec(toys.optargs);
+    if (!TT.pid) xexec(toys.optargs);
   }
 }