diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-10 02:17:49 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-10 02:17:49 +0300 |
| commit | 4c31c30302358ce1d253f915a064722db33c2114 (patch) | |
| tree | f592738f7d3f1ed1640f28db6c2b987fc826ba65 /fs | |
| parent | c4888f9ffafe7db107b7eafb3a68eaeeff3779c3 (diff) | |
| parent | 2ad8b1ef11c98c5603580878aebf9f1bc74129e4 (diff) | |
| download | linux-4c31c30302358ce1d253f915a064722db33c2114.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Add UNPLUG traces to all appropriate places
block: fix requeue handling in blk_queue_invalidate_tags()
mmc: Fix sg helper copy-and-paste error
pktcdvd: fix BUG caused by sysfs module reference semantics change
ioprio: allow sys_ioprio_set() value of 0 to reset ioprio setting
cfq_idle_class_timer: add paranoid checks for jiffies overflow
cfq: fix IOPRIO_CLASS_IDLE delays
cfq: fix IOPRIO_CLASS_IDLE accounting
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ioprio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index d6ff77e8e7ec..e4e01bc7f338 100644 --- a/fs/ioprio.c +++ b/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; } |