diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
| commit | 183f7802e73e26206558864d1b67e64382257277 (patch) | |
| tree | b380d7a8db726e7839f50fa07d3f1a1e80589ec3 /block/blk.h | |
| parent | 1c220c69ce0dcc0f234a9f263ad9c0864f971852 (diff) | |
| parent | f6454b049d81bb3d732b6a8afde08420589c6af9 (diff) | |
| download | op-kernel-dev-183f7802e73e26206558864d1b67e64382257277.zip op-kernel-dev-183f7802e73e26206558864d1b67e64382257277.tar.gz | |
Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk.h b/block/blk.h index 43b0361..026d959 100644 --- a/block/blk.h +++ b/block/blk.h @@ -78,7 +78,8 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req, bool bio_attempt_back_merge(struct request_queue *q, struct request *req, struct bio *bio); bool blk_attempt_plug_merge(struct request_queue *q, struct bio *bio, - unsigned int *request_count); + unsigned int *request_count, + struct request **same_queue_rq); void blk_account_io_start(struct request *req, bool new_io); void blk_account_io_completion(struct request *req, unsigned int bytes); @@ -193,8 +194,6 @@ int blk_try_merge(struct request *rq, struct bio *bio); void blk_queue_congestion_threshold(struct request_queue *q); -void __blk_run_queue_uncond(struct request_queue *q); - int blk_dev_init(void); |
