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

Commit ce289321 authored by Kirill Afonshin's avatar Kirill Afonshin Committed by Jens Axboe
Browse files

block: removed unused as_io_context 



It isn't used anymore, since AS was deleted.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent b27d7f16

block/blk-ioc.c

+0 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ int put_io_context(struct io_context *ioc) 


	if (atomic_long_dec_and_test(&ioc->refcount)) {

		rcu_read_lock();

		if (ioc->aic && ioc->aic->dtor)

			ioc->aic->dtor(ioc->aic);

		cfq_dtor(ioc);

		rcu_read_unlock();
@@ -76,8 +74,6 @@ void exit_io_context(struct task_struct *task) 
	task_unlock(task);



	if (atomic_dec_and_test(&ioc->nr_tasks)) {

		if (ioc->aic && ioc->aic->exit)

			ioc->aic->exit(ioc->aic);

		cfq_exit(ioc);



	}
@@ -97,7 +93,6 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node) 
		ret->ioprio = 0;

		ret->last_waited = jiffies; /* doesn't matter... */

		ret->nr_batch_requests = 0; /* because this is 0 */

		ret->aic = NULL;

		INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH);

		INIT_HLIST_HEAD(&ret->cic_list);

		ret->ioc_data = NULL;

include/linux/iocontext.h

+0 −27
Original line number Diff line number Diff line
@@ -4,32 +4,6 @@ 
#include <linux/radix-tree.h>

#include <linux/rcupdate.h>



/*

 * This is the per-process anticipatory I/O scheduler state.

 */

struct as_io_context {

	spinlock_t lock;



	void (*dtor)(struct as_io_context *aic); /* destructor */

	void (*exit)(struct as_io_context *aic); /* called on task exit */



	unsigned long state;

	atomic_t nr_queued; /* queued reads & sync writes */

	atomic_t nr_dispatched; /* number of requests gone to the drivers */



	/* IO History tracking */

	/* Thinktime */

	unsigned long last_end_request;

	unsigned long ttime_total;

	unsigned long ttime_samples;

	unsigned long ttime_mean;

	/* Layout pattern */

	unsigned int seek_samples;

	sector_t last_request_pos;

	u64 seek_total;

	sector_t seek_mean;

};



struct cfq_queue;

struct cfq_io_context {

	void *key;
@@ -78,7 +52,6 @@ struct io_context { 
	unsigned long last_waited; /* Time last woken after wait for request */

	int nr_batch_requests;     /* Number of requests left in the batch */



	struct as_io_context *aic;

	struct radix_tree_root radix_root;

	struct hlist_head cic_list;

	void *ioc_data;