Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2b9c1f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: don't delay blk_run_queue_async
  scsi: remove performance regression due to async queue run
  blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup
  block: rescan partitions on invalidated devices on -ENOMEDIA too
  cdrom: always check_disk_change() on open
  block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers
parents 2e9521fd 3ec717b7

block/blk-cgroup.c

+7 −0
Original line number Diff line number Diff line
@@ -114,6 +114,13 @@ struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) 
}

EXPORT_SYMBOL_GPL(cgroup_to_blkio_cgroup);



struct blkio_cgroup *task_blkio_cgroup(struct task_struct *tsk)

{

	return container_of(task_subsys_state(tsk, blkio_subsys_id),

			    struct blkio_cgroup, css);

}

EXPORT_SYMBOL_GPL(task_blkio_cgroup);



static inline void

blkio_update_group_weight(struct blkio_group *blkg, unsigned int weight)

{

block/blk-cgroup.h

+3 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ static inline void blkiocg_set_start_empty_time(struct blkio_group *blkg) {} 
#if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE)

extern struct blkio_cgroup blkio_root_cgroup;

extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup);

extern struct blkio_cgroup *task_blkio_cgroup(struct task_struct *tsk);

extern void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,

	struct blkio_group *blkg, void *key, dev_t dev,

	enum blkio_policy_id plid);
@@ -314,6 +315,8 @@ void blkiocg_update_io_remove_stats(struct blkio_group *blkg, 
struct cgroup;

static inline struct blkio_cgroup *

cgroup_to_blkio_cgroup(struct cgroup *cgroup) { return NULL; }

static inline struct blkio_cgroup *

task_blkio_cgroup(struct task_struct *tsk) { return NULL; }



static inline void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,

		struct blkio_group *blkg, void *key, dev_t dev,

block/blk-core.c

+3 −1
Original line number Diff line number Diff line
@@ -316,9 +316,11 @@ EXPORT_SYMBOL(__blk_run_queue); 
 */

void blk_run_queue_async(struct request_queue *q)

{

	if (likely(!blk_queue_stopped(q)))

	if (likely(!blk_queue_stopped(q))) {

		__cancel_delayed_work(&q->delay_work);

		queue_delayed_work(kblockd_workqueue, &q->delay_work, 0);

	}

}

EXPORT_SYMBOL(blk_run_queue_async);



/**

block/blk-throttle.c

+4 −5
Original line number Diff line number Diff line
@@ -160,9 +160,8 @@ static void throtl_put_tg(struct throtl_grp *tg) 
}



static struct throtl_grp * throtl_find_alloc_tg(struct throtl_data *td,

			struct cgroup *cgroup)

			struct blkio_cgroup *blkcg)

{

	struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgroup);

	struct throtl_grp *tg = NULL;

	void *key = td;

	struct backing_dev_info *bdi = &td->queue->backing_dev_info;
@@ -229,12 +228,12 @@ static struct throtl_grp * throtl_find_alloc_tg(struct throtl_data *td, 


static struct throtl_grp * throtl_get_tg(struct throtl_data *td)

{

	struct cgroup *cgroup;

	struct throtl_grp *tg = NULL;

	struct blkio_cgroup *blkcg;



	rcu_read_lock();

	cgroup = task_cgroup(current, blkio_subsys_id);

	tg = throtl_find_alloc_tg(td, cgroup);

	blkcg = task_blkio_cgroup(current);

	tg = throtl_find_alloc_tg(td, blkcg);

	if (!tg)

		tg = &td->root_tg;

	rcu_read_unlock();

block/cfq-iosched.c

+5 −6
Original line number Diff line number Diff line
@@ -1014,10 +1014,9 @@ void cfq_update_blkio_group_weight(void *key, struct blkio_group *blkg, 
	cfqg->needs_update = true;

}



static struct cfq_group *

cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create)

static struct cfq_group * cfq_find_alloc_cfqg(struct cfq_data *cfqd,

		struct blkio_cgroup *blkcg, int create)

{

	struct blkio_cgroup *blkcg = cgroup_to_blkio_cgroup(cgroup);

	struct cfq_group *cfqg = NULL;

	void *key = cfqd;

	int i, j;
@@ -1079,12 +1078,12 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create) 
 */

static struct cfq_group *cfq_get_cfqg(struct cfq_data *cfqd, int create)

{

	struct cgroup *cgroup;

	struct blkio_cgroup *blkcg;

	struct cfq_group *cfqg = NULL;



	rcu_read_lock();

	cgroup = task_cgroup(current, blkio_subsys_id);

	cfqg = cfq_find_alloc_cfqg(cfqd, cgroup, create);

	blkcg = task_blkio_cgroup(current);

	cfqg = cfq_find_alloc_cfqg(cfqd, blkcg, create);

	if (!cfqg && create)

		cfqg = &cfqd->root_group;

	rcu_read_unlock();