git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: Adjust elv_iosched_show to return "none" for bio-based DM
[pandora-kernel.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index
76e3702
..
0abce47
100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-539,6
+539,15
@@
void elv_merge_requests(struct request_queue *q, struct request *rq,
q->last_merge = rq;
}
q->last_merge = rq;
}
+void elv_bio_merged(struct request_queue *q, struct request *rq,
+ struct bio *bio)
+{
+ struct elevator_queue *e = q->elevator;
+
+ if (e->ops->elevator_bio_merged_fn)
+ e->ops->elevator_bio_merged_fn(q, rq, bio);
+}
+
void elv_requeue_request(struct request_queue *q, struct request *rq)
{
/*
void elv_requeue_request(struct request_queue *q, struct request *rq)
{
/*
@@
-921,6
+930,7
@@
int elv_register_queue(struct request_queue *q)
}
return error;
}
}
return error;
}
+EXPORT_SYMBOL(elv_register_queue);
static void __elv_unregister_queue(struct elevator_queue *e)
{
static void __elv_unregister_queue(struct elevator_queue *e)
{
@@
-933,6
+943,7
@@
void elv_unregister_queue(struct request_queue *q)
if (q)
__elv_unregister_queue(q->elevator);
}
if (q)
__elv_unregister_queue(q->elevator);
}
+EXPORT_SYMBOL(elv_unregister_queue);
void elv_register(struct elevator_type *e)
{
void elv_register(struct elevator_type *e)
{
@@
-1086,7
+1097,7
@@
ssize_t elv_iosched_show(struct request_queue *q, char *name)
struct elevator_type *__e;
int len = 0;
struct elevator_type *__e;
int len = 0;
- if (!q->elevator)
+ if (!q->elevator
|| !blk_queue_stackable(q)
)
return sprintf(name, "none\n");
elv = e->elevator_type;
return sprintf(name, "none\n");
elv = e->elevator_type;