imported patch fix-cfq-iscsi-live-lock.patch

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index a8ac140b3e295f513478e14012bf3078e882b4e3..f4058f7ba056f8c6c1c5083cb5ca9cde98742dc8 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1047,7 +1047,7 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd)
        }
 
 expire:
-       cfq_slice_expired(cfqd, 0);
+       cfq_slice_expired(cfqd, 1);
 new_queue:
        cfqq = cfq_set_active_queue(cfqd);
 keep_queue: