xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.15-rc1' into for-3.16/core

Browse Source 
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
This commit is contained in:
Jens Axboe
2014-04-15 14:02:24 -06:00
parent 21f9fcd815 c9eaa447e7
commit f89e0dd9d1
2159 changed files with 167482 additions and 35174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/linux/blkdev.h
View File

@@ -118,7 +118,18 @@ struct request {
struct bio *bio;
struct bio *biotail;
struct hlist_node hash; /* merge hash */
/*
* The hash is used inside the scheduler, and killed once the
* request reaches the dispatch list. The ipi_list is only used
* to queue the request for softirq completion, which is long
* after the request has been unhashed (and even removed from
* the dispatch list).
*/
union {
struct hlist_node hash; /* merge hash */
struct list_head ipi_list;
};
/*
* The rb_node is only used inside the io scheduler, requests
* are pruned when moved to the dispatch queue. So let the
@@ -824,8 +835,8 @@ extern int blk_rq_map_user(struct request_queue *, struct request *,
extern int blk_rq_unmap_user(struct bio *);
extern int blk_rq_map_kern(struct request_queue *, struct request *, void *, unsigned int, gfp_t);
extern int blk_rq_map_user_iov(struct request_queue *, struct request *,
struct rq_map_data *, struct sg_iovec *, int,
unsigned int, gfp_t);
struct rq_map_data *, const struct sg_iovec *,
int, unsigned int, gfp_t);
extern int blk_execute_rq(struct request_queue *, struct gendisk *,
struct request *, int);
extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,