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

Commit bc9fcbf9 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

block: move blk_throtl prototypes to block/blk.h 



blk_throtl interface is block internal and there's no reason to have
them in linux/blkdev.h.  Move them to block/blk.h.

This patch doesn't introduce any functional change.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ece84241

block/blk-throttle.c

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

#include <linux/blktrace_api.h>

#include "blk-cgroup.h"

#include "blk.h"



/* Max dispatch from a group in 1 round */

static int throtl_grp_quantum = 8;

block/blk.h

+14 −1
Original line number Diff line number Diff line
@@ -188,4 +188,17 @@ static inline int blk_do_io_stat(struct request *rq) 
	        (rq->cmd_flags & REQ_DISCARD));

}



#endif
 
#ifdef CONFIG_BLK_DEV_THROTTLING

extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);

extern int blk_throtl_init(struct request_queue *q);

extern void blk_throtl_exit(struct request_queue *q);

#else /* CONFIG_BLK_DEV_THROTTLING */

static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)

{

	return 0;

}

static inline int blk_throtl_init(struct request_queue *q) { return 0; }

static inline void blk_throtl_exit(struct request_queue *q) { }

#endif /* CONFIG_BLK_DEV_THROTTLING */



#endif /* BLK_INTERNAL_H */

include/linux/blkdev.h

+0 −14
Original line number Diff line number Diff line
@@ -1197,20 +1197,6 @@ static inline uint64_t rq_io_start_time_ns(struct request *req) 
}

#endif



#ifdef CONFIG_BLK_DEV_THROTTLING

extern int blk_throtl_init(struct request_queue *q);

extern void blk_throtl_exit(struct request_queue *q);

extern int blk_throtl_bio(struct request_queue *q, struct bio **bio);

#else /* CONFIG_BLK_DEV_THROTTLING */

static inline int blk_throtl_bio(struct request_queue *q, struct bio **bio)

{

	return 0;

}



static inline int blk_throtl_init(struct request_queue *q) { return 0; }

static inline int blk_throtl_exit(struct request_queue *q) { return 0; }

#endif /* CONFIG_BLK_DEV_THROTTLING */



#define MODULE_ALIAS_BLOCKDEV(major,minor) \

	MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))

#define MODULE_ALIAS_BLOCKDEV_MAJOR(major) \