Commit 2e9bc346 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move elevator.h to block/ 



Except for the features passed to blk_queue_required_elevator_features,
elevator.h is only needed internally to the block layer.  Move the
ELEVATOR_F_* definitions to blkdev.h, and the move elevator.h to
block/, dropping all the spurious includes outside of that.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20210920123328.1399408-13-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9778ac77

block/bfq-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ 
#include <linux/slab.h>

#include <linux/blkdev.h>

#include <linux/cgroup.h>

#include <linux/elevator.h>

#include <linux/ktime.h>

#include <linux/rbtree.h>

#include <linux/ioprio.h>

#include <linux/sbitmap.h>

#include <linux/delay.h>



#include "elevator.h"

#include "bfq-iosched.h"



#ifdef CONFIG_BFQ_CGROUP_DEBUG

block/bfq-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ 
#include <linux/slab.h>

#include <linux/blkdev.h>

#include <linux/cgroup.h>

#include <linux/elevator.h>

#include <linux/ktime.h>

#include <linux/rbtree.h>

#include <linux/ioprio.h>
@@ -127,6 +126,7 @@ 


#include <trace/events/block.h>



#include "elevator.h"

#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"

block/blk-mq-sched.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef BLK_MQ_SCHED_H

#define BLK_MQ_SCHED_H



#include "elevator.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"

block/blk-mq-tag.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef INT_BLK_MQ_TAG_H

#define INT_BLK_MQ_TAG_H



struct blk_mq_alloc_data;



/*

 * Tag address space map.

 */

block/blk.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include "blk-mq.h"

#include "blk-mq-sched.h"



struct elevator_type;



/* Max future timer expiry for timeouts */

#define BLK_MAX_TIMEOUT		(5 * HZ)