projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.linux-watchdog.org/linux-watchdog
[deliverable/linux.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index c3555c9c672f94c1f13c3cd3c75c037e7c8110a7..7096c22041e7e6680b320ca08e4be831591b6477 100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-53,13
+53,13
@@
static LIST_HEAD(elv_list);
* Query io scheduler to see if the current process issuing bio may be
* merged with rq.
*/
* Query io scheduler to see if the current process issuing bio may be
* merged with rq.
*/
-static int elv_iosched_allow_merge(struct request *rq, struct bio *bio)
+static int elv_iosched_allow_
bio_
merge(struct request *rq, struct bio *bio)
{
struct request_queue *q = rq->q;
struct elevator_queue *e = q->elevator;
{
struct request_queue *q = rq->q;
struct elevator_queue *e = q->elevator;
- if (e->type->ops.elevator_allow_merge_fn)
- return e->type->ops.elevator_allow_merge_fn(q, rq, bio);
+ if (e->type->ops.elevator_allow_
bio_
merge_fn)
+ return e->type->ops.elevator_allow_
bio_
merge_fn(q, rq, bio);
return 1;
}
return 1;
}
@@
-67,17
+67,17
@@
static int elv_iosched_allow_merge(struct request *rq, struct bio *bio)
/*
* can we safely merge with this request?
*/
/*
* can we safely merge with this request?
*/
-bool elv_
rq
_merge_ok(struct request *rq, struct bio *bio)
+bool elv_
bio
_merge_ok(struct request *rq, struct bio *bio)
{
if (!blk_rq_merge_ok(rq, bio))
{
if (!blk_rq_merge_ok(rq, bio))
- return
0
;
+ return
false
;
- if (!elv_iosched_allow_merge(rq, bio))
- return
0
;
+ if (!elv_iosched_allow_
bio_
merge(rq, bio))
+ return
false
;
- return
1
;
+ return
true
;
}
}
-EXPORT_SYMBOL(elv_
rq
_merge_ok);
+EXPORT_SYMBOL(elv_
bio
_merge_ok);
static struct elevator_type *elevator_find(const char *name)
{
static struct elevator_type *elevator_find(const char *name)
{
@@
-366,8
+366,7
@@
void elv_dispatch_sort(struct request_queue *q, struct request *rq)
list_for_each_prev(entry, &q->queue_head) {
struct request *pos = list_entry_rq(entry);
list_for_each_prev(entry, &q->queue_head) {
struct request *pos = list_entry_rq(entry);
- if ((rq->cmd_flags & REQ_DISCARD) !=
- (pos->cmd_flags & REQ_DISCARD))
+ if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD))
break;
if (rq_data_dir(rq) != rq_data_dir(pos))
break;
break;
if (rq_data_dir(rq) != rq_data_dir(pos))
break;
@@
-426,7
+425,7
@@
int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
/*
* First try one-hit cache.
*/
/*
* First try one-hit cache.
*/
- if (q->last_merge && elv_
rq
_merge_ok(q->last_merge, bio)) {
+ if (q->last_merge && elv_
bio
_merge_ok(q->last_merge, bio)) {
ret = blk_try_merge(q->last_merge, bio);
if (ret != ELEVATOR_NO_MERGE) {
*req = q->last_merge;
ret = blk_try_merge(q->last_merge, bio);
if (ret != ELEVATOR_NO_MERGE) {
*req = q->last_merge;
@@
-441,7
+440,7
@@
int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
* See if our hash lookup can find a potential backmerge.
*/
__rq = elv_rqhash_find(q, bio->bi_iter.bi_sector);
* See if our hash lookup can find a potential backmerge.
*/
__rq = elv_rqhash_find(q, bio->bi_iter.bi_sector);
- if (__rq && elv_
rq
_merge_ok(__rq, bio)) {
+ if (__rq && elv_
bio
_merge_ok(__rq, bio)) {
*req = __rq;
return ELEVATOR_BACK_MERGE;
}
*req = __rq;
return ELEVATOR_BACK_MERGE;
}
@@
-717,12
+716,12
@@
void elv_put_request(struct request_queue *q, struct request *rq)
e->type->ops.elevator_put_req_fn(rq);
}
e->type->ops.elevator_put_req_fn(rq);
}
-int elv_may_queue(struct request_queue *q, int
rw
)
+int elv_may_queue(struct request_queue *q, int
op, int op_flags
)
{
struct elevator_queue *e = q->elevator;
if (e->type->ops.elevator_may_queue_fn)
{
struct elevator_queue *e = q->elevator;
if (e->type->ops.elevator_may_queue_fn)
- return e->type->ops.elevator_may_queue_fn(q,
rw
);
+ return e->type->ops.elevator_may_queue_fn(q,
op, op_flags
);
return ELV_MQUEUE_MAY;
}
return ELV_MQUEUE_MAY;
}
This page took
0.027671 seconds
and
5
git commands to generate.