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

Commit 07e44708 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'cfq' into for-linus

parents 2a12dcd7 597bc485

block/cfq-iosched.c

+437 −416

File changed.

Preview size limit exceeded, changes collapsed.

block/ll_rw_blk.c

+1 −0
Original line number Original line 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->nr_batch_requests = 0; /* because this is 0 */

		ret->aic = NULL;

		ret->aic = NULL;

		ret->cic_root.rb_node = NULL;

		ret->cic_root.rb_node = NULL;

		ret->ioc_data = NULL;

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

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

		smp_wmb();

		smp_wmb();

		tsk->io_context = ret;

		tsk->io_context = ret;

include/linux/blkdev.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -116,6 +116,7 @@ struct io_context { 




	struct as_io_context *aic;

	struct as_io_context *aic;

	struct rb_root cic_root;

	struct rb_root cic_root;

	void *ioc_data;

};

};





void put_io_context(struct io_context *ioc);

void put_io_context(struct io_context *ioc);