1. 14 4月, 2010 2 次提交
    • J
      Merge branch 'master' into for-2.6.35 · 4facdaec
      Jens Axboe 提交于
      Conflicts:
      	block/blk-cgroup.c
      	block/cfq-iosched.c
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      4facdaec
    • D
      block: Update to io-controller stats · a11cdaa7
      Divyesh Shah 提交于
      Changelog from v1:
      o Call blkiocg_update_idle_time_stats() at cfq_rq_enqueued() instead of at
        dispatch time.
      
      Changelog from original patchset: (in response to Vivek Goyal's comments)
      o group blkiocg_update_blkio_group_dequeue_stats() with other DEBUG functions
      o rename blkiocg_update_set_active_queue_stats() to
        blkiocg_update_avg_queue_size_stats()
      o s/request/io/ in blkiocg_update_request_add_stats() and
        blkiocg_update_request_remove_stats()
      o Call cfq_del_timer() at request dispatch() instead of
        blkiocg_update_idle_time_stats()
      
      Signed-off-by: Divyesh Shah<dpshah@google.com>
      Acked-by: NVivek Goyal <vgoyal@redhat.com>
      Signed-off-by: NJens Axboe <jens.axboe@oracle.com>
      a11cdaa7
  2. 13 4月, 2010 38 次提交
反馈
建议
客服 返回
顶部