From 3a4fd3182f5b8c51cc2ad103fdb04a12fbb8e200 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 20 Aug 2005 18:51:29 -0700
Subject: [PATCH] --- yaml --- r: 5915 b: refs/heads/master c:
 f6fdd7d9c273bb2a20ab467cb57067494f932fa3 h: refs/heads/master i:   5913:
 6c718bc79644bd4503eb7945aaad43fe578a896a   5911:
 6578bee69f1fe3db96219d2a188c22fccba6f8a0 v: v3

---
 [refs]            | 2 +-
 trunk/fs/ioprio.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9337801d504a..a30d683b630e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e71af49d46e4c25f17a2c8f53d62ffd14f01007
+refs/heads/master: f6fdd7d9c273bb2a20ab467cb57067494f932fa3
diff --git a/trunk/fs/ioprio.c b/trunk/fs/ioprio.c
index 97e1f088ba00..d1c1f2b2c9da 100644
--- a/trunk/fs/ioprio.c
+++ b/trunk/fs/ioprio.c
@@ -62,6 +62,8 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
 
 			break;
 		case IOPRIO_CLASS_IDLE:
+			if (!capable(CAP_SYS_ADMIN))
+				return -EPERM;
 			break;
 		default:
 			return -EINVAL;