diff --git a/[refs] b/[refs]
index e3222ce795f2..7576db7d0608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e7be9edb9134f833278c381b6feabb54b875208
+refs/heads/master: 8ec680e4c3ec818efd1652f15199ed1c216ab550
diff --git a/trunk/fs/ioprio.c b/trunk/fs/ioprio.c
index d6ff77e8e7ec..e4e01bc7f338 100644
--- a/trunk/fs/ioprio.c
+++ b/trunk/fs/ioprio.c
@@ -78,6 +78,10 @@ asmlinkage long sys_ioprio_set(int which, int who, int ioprio)
 			if (!capable(CAP_SYS_ADMIN))
 				return -EPERM;
 			break;
+		case IOPRIO_CLASS_NONE:
+			if (data)
+				return -EINVAL;
+			break;
 		default:
 			return -EINVAL;
 	}