Advertisement
Guest User

Untitled

a guest
Jul 27th, 2017
64
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.18 KB | None | 0 0
  1. pwd
  2. /usr/src/linux-2.6.37
  3.  
  4. patch -p0 < patch
  5. patching file linux-2.6/block/cfq-iosched.c
  6. Hunk #1 FAILED at 498.
  7. Hunk #2 FAILED at 2229.
  8. Hunk #3 FAILED at 2499.
  9. Hunk #4 FAILED at 3359.
  10. 4 out of 4 hunks FAILED -- saving rejects to file linux-2.6/block/cfq-iosched.c.rej
  11.  
  12. cat patch
  13. block/cfq-iosched.c | 10 +++++++---
  14. 1 file changed, 7 insertions(+), 3 deletions(-)
  15.  
  16. Index: linux-2.6/block/cfq-iosched.c
  17. ===================================================================
  18. --- linux-2.6.orig/block/cfq-iosched.c 2011-02-22 13:23:25.000000000 -0500
  19. +++ linux-2.6/block/cfq-iosched.c 2011-02-22 14:01:21.515363676 -0500
  20. @@ -498,7 +498,7 @@ static inline bool cfq_bio_sync(struct b
  21. static inline void cfq_schedule_dispatch(struct cfq_data *cfqd)
  22. {
  23. if (cfqd->busy_queues) {
  24. - cfq_log(cfqd, "schedule dispatch");
  25. + cfq_log(cfqd, "schedule dispatch: busy_queues=%d rq_queued=%d rq_in_driver=%d", cfqd->busy_queues, cfqd->rq_queued, cfqd->rq_in_driver);
  26. kblockd_schedule_work(cfqd->queue, &cfqd->unplug_work);
  27. }
  28. }
  29. @@ -2229,6 +2229,8 @@ static struct cfq_queue *cfq_select_queu
  30. {
  31. struct cfq_queue *cfqq, *new_cfqq = NULL;
  32.  
  33. + cfq_log(cfqd, "select_queue: busy_queues=%d rq_queued=%d rq_in_driver=%d", cfqd->busy_queues, cfqd->rq_queued, cfqd->rq_in_driver);
  34. +
  35. cfqq = cfqd->active_queue;
  36. if (!cfqq)
  37. goto new_queue;
  38. @@ -2499,8 +2501,10 @@ static int cfq_dispatch_requests(struct
  39. return cfq_forced_dispatch(cfqd);
  40.  
  41. cfqq = cfq_select_queue(cfqd);
  42. - if (!cfqq)
  43. + if (!cfqq) {
  44. + cfq_log(cfqd, "select: no cfqq selected");
  45. return 0;
  46. + }
  47.  
  48. /*
  49. * Dispatch a request from this cfqq, if it is allowed
  50. @@ -3359,7 +3363,7 @@ static void cfq_insert_request(struct re
  51. struct cfq_data *cfqd = q->elevator->elevator_data;
  52. struct cfq_queue *cfqq = RQ_CFQQ(rq);
  53.  
  54. - cfq_log_cfqq(cfqd, cfqq, "insert_request");
  55. + cfq_log_cfqq(cfqd, cfqq, "insert_request: busy_queues=%d rq_queued=%d rq_in_driver=%d", cfqd->busy_queues, cfqd->rq_queued, cfqd->rq_in_driver);
  56. cfq_init_prio_data(cfqq, RQ_CIC(rq)->ioc);
  57.  
  58. rq_set_fifo_time(rq, jiffies + cfqd->cfq_fifo_expire[rq_is_sync(rq)]);
  59.  
  60. md5sum block/cfq-iosched.c
  61. cf11d5bb5aec76d79c0eaba47e29d5c0 block/cfq-iosched.c
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement