iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: move bounce declarations to block/blk.h

Browse Source 
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2017-06-19 09:26:21 +02:00 committed by Jens Axboe
parent caa4b02476
commit 3bce016a4c
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
block/blk.h
View File

@ -336,4 +336,17 @@ static inline void blk_throtl_bio_endio(struct bio *bio) { }
static inline void blk_throtl_stat_add(struct request *rq, u64 time) { } static inline void blk_throtl_stat_add(struct request *rq, u64 time) { }
#endif #endif
#ifdef CONFIG_BOUNCE
extern int init_emergency_isa_pool(void);
extern void blk_queue_bounce(struct request_queue *q, struct bio **bio);
#else
static inline int init_emergency_isa_pool(void)
{
return 0;
}
static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio)
{
}
#endif /* CONFIG_BOUNCE */
#endif /* BLK_INTERNAL_H */ #endif /* BLK_INTERNAL_H */

1
block/bounce.c
View File

@ -22,6 +22,7 @@
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <trace/events/block.h> #include <trace/events/block.h>
#include "blk.h"
#define POOL_SIZE 64 #define POOL_SIZE 64
#define ISA_POOL_SIZE 16 #define ISA_POOL_SIZE 16

13
include/linux/blkdev.h
View File

@ -884,19 +884,6 @@ extern unsigned long blk_max_low_pfn, blk_max_pfn;
#define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ)
#define BLK_MIN_SG_TIMEOUT (7 * HZ) #define BLK_MIN_SG_TIMEOUT (7 * HZ)
#ifdef CONFIG_BOUNCE
extern int init_emergency_isa_pool(void);
extern void blk_queue_bounce(struct request_queue *q, struct bio **bio);
#else
static inline int init_emergency_isa_pool(void)
{
return 0;
}
static inline void blk_queue_bounce(struct request_queue *q, struct bio **bio)
{
}
#endif /* CONFIG_MMU */
struct rq_map_data { struct rq_map_data {
struct page **pages; struct page **pages;
int page_order; int page_order;