diff --git a/[refs] b/[refs] index 3d2d725f5f1c..89cb0b355335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c981ff9f893b9ab229a809f8ad287ae43fc17a64 +refs/heads/master: b0a6916bcc48f46996d54b8451591a2f2b7b2f64 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index c8dbe38c81c8..37a2a772498c 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1179,7 +1179,7 @@ __cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned int prio, hlist_for_each_safe(entry, next, hash_list) { struct cfq_queue *__cfqq = list_entry_qhash(entry); - const unsigned short __p = IOPRIO_PRIO_VALUE(__cfqq->ioprio_class, __cfqq->ioprio); + const unsigned short __p = IOPRIO_PRIO_VALUE(__cfqq->org_ioprio_class, __cfqq->org_ioprio); if (__cfqq->key == key && (__p == prio || prio == CFQ_KEY_ANY)) return __cfqq;