diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /fs/ioprio.c | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'fs/ioprio.c')
| -rw-r--r-- | fs/ioprio.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 6dc6721d9e82..89e8da112a75 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c | |||
| @@ -150,11 +150,6 @@ int ioprio_best(unsigned short aprio, unsigned short bprio) | |||
| 150 | unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); | 150 | unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); |
| 151 | unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); | 151 | unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); |
| 152 | 152 | ||
| 153 | if (!ioprio_valid(aprio)) | ||
| 154 | return bprio; | ||
| 155 | if (!ioprio_valid(bprio)) | ||
| 156 | return aprio; | ||
| 157 | |||
| 158 | if (aclass == IOPRIO_CLASS_NONE) | 153 | if (aclass == IOPRIO_CLASS_NONE) |
| 159 | aclass = IOPRIO_CLASS_BE; | 154 | aclass = IOPRIO_CLASS_BE; |
| 160 | if (bclass == IOPRIO_CLASS_NONE) | 155 | if (bclass == IOPRIO_CLASS_NONE) |