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

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

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

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  [PATCH] elevator: elv_list_lock does not need irq disabling
  [BLOCK] Don't pin lots of memory in mempools
  cfq-iosched: speedup cic rb lookup
  ll_rw_blk: add io_context private pointer
  cfq-iosched: get rid of cfqq hash
  cfq-iosched: tighten queue request overlap condition
  cfq-iosched: improve sync vs async workloads
  cfq-iosched: never allow an async queue idling
  cfq-iosched: get rid of ->dispatch_slice
  cfq-iosched: don't pass unused preemption variable around
  cfq-iosched: get rid of ->cur_rr and ->cfq_list
  cfq-iosched: slice offset should take ioprio into account
  [PATCH] cfq-iosched: style cleanups and comments
  cfq-iosched: sort IDLE queues into the rbtree
  cfq-iosched: sort RT queues into the rbtree
  [PATCH] cfq-iosched: speed up rbtree handling
  cfq-iosched: rework the whole round-robin list concept
  cfq-iosched: minor updates
  cfq-iosched: development update
  cfq-iosched: improve preemption for cooperating tasks
parents 24a77daf 07e44708

block/cfq-iosched.c

+437 −416

File changed.

Preview size limit exceeded, changes collapsed.

block/elevator.c

+9 −8
Original line number Diff line number Diff line
@@ -134,13 +134,13 @@ static struct elevator_type *elevator_get(const char *name) 
{

	struct elevator_type *e;



	spin_lock_irq(&elv_list_lock);

	spin_lock(&elv_list_lock);



	e = elevator_find(name);

	if (e && !try_module_get(e->elevator_owner))

		e = NULL;



	spin_unlock_irq(&elv_list_lock);

	spin_unlock(&elv_list_lock);



	return e;

}
@@ -965,10 +965,11 @@ void elv_unregister_queue(struct request_queue *q) 
int elv_register(struct elevator_type *e)

{

	char *def = "";

	spin_lock_irq(&elv_list_lock);



	spin_lock(&elv_list_lock);

	BUG_ON(elevator_find(e->elevator_name));

	list_add_tail(&e->list, &elv_list);

	spin_unlock_irq(&elv_list_lock);

	spin_unlock(&elv_list_lock);



	if (!strcmp(e->elevator_name, chosen_elevator) ||

			(!*chosen_elevator &&
@@ -998,9 +999,9 @@ void elv_unregister(struct elevator_type *e) 
		read_unlock(&tasklist_lock);

	}



	spin_lock_irq(&elv_list_lock);

	spin_lock(&elv_list_lock);

	list_del_init(&e->list);

	spin_unlock_irq(&elv_list_lock);

	spin_unlock(&elv_list_lock);

}

EXPORT_SYMBOL_GPL(elv_unregister);
@@ -1118,7 +1119,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name) 
	struct list_head *entry;

	int len = 0;



	spin_lock_irq(&elv_list_lock);

	spin_lock(&elv_list_lock);

	list_for_each(entry, &elv_list) {

		struct elevator_type *__e;
@@ -1128,7 +1129,7 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name) 
		else

			len += sprintf(name+len, "%s ", __e->elevator_name);

	}

	spin_unlock_irq(&elv_list_lock);

	spin_unlock(&elv_list_lock);



	len += sprintf(len+name, "\n");

	return len;

block/ll_rw_blk.c

+1 −0
Original line number Diff line number Diff line
@@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node) 
		ret->nr_batch_requests = 0; /* because this is 0 */

		ret->aic = NULL;

		ret->cic_root.rb_node = NULL;

		ret->ioc_data = NULL;

		/* make sure set_task_ioprio() sees the settings above */

		smp_wmb();

		tsk->io_context = ret;

drivers/md/dm-crypt.c

+1 −1
Original line number Diff line number Diff line
@@ -867,7 +867,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
		goto bad4;

	}



	cc->bs = bioset_create(MIN_IOS, MIN_IOS, 4);

	cc->bs = bioset_create(MIN_IOS, MIN_IOS);

	if (!cc->bs) {

		ti->error = "Cannot allocate crypt bioset";

		goto bad_bs;

drivers/md/dm-io.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int resize_pool(unsigned int new_ios) 
		if (!_io_pool)

			return -ENOMEM;



		_bios = bioset_create(16, 16, 4);

		_bios = bioset_create(16, 16);

		if (!_bios) {

			mempool_destroy(_io_pool);

			_io_pool = NULL;