projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index 487dd3da8853971d9bcb77cf6ecf51eb39faedf3..8ccd163254b8acf1469628e432308ab73cedd97b 100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-93,21
+93,18
@@
static inline int elv_try_merge(struct request *__rq, struct bio *bio)
static struct elevator_type *elevator_find(const char *name)
{
static struct elevator_type *elevator_find(const char *name)
{
- struct elevator_type *e
= NULL
;
+ struct elevator_type *e;
struct list_head *entry;
list_for_each(entry, &elv_list) {
struct list_head *entry;
list_for_each(entry, &elv_list) {
- struct elevator_type *__e;
-
__
e = list_entry(entry, struct elevator_type, list);
+ e = list_entry(entry, struct elevator_type, list);
- if (!strcmp(__e->elevator_name, name)) {
- e = __e;
- break;
- }
+ if (!strcmp(e->elevator_name, name))
+ return e;
}
}
- return
e
;
+ return
NULL
;
}
static void elevator_put(struct elevator_type *e)
}
static void elevator_put(struct elevator_type *e)
@@
-1088,7
+1085,7
@@
ssize_t elv_iosched_show(request_queue_t *q, char *name)
struct list_head *entry;
int len = 0;
struct list_head *entry;
int len = 0;
- spin_lock_irq(
q->queue
_lock);
+ spin_lock_irq(
&elv_list
_lock);
list_for_each(entry, &elv_list) {
struct elevator_type *__e;
list_for_each(entry, &elv_list) {
struct elevator_type *__e;
@@
-1098,7
+1095,7
@@
ssize_t elv_iosched_show(request_queue_t *q, char *name)
else
len += sprintf(name+len, "%s ", __e->elevator_name);
}
else
len += sprintf(name+len, "%s ", __e->elevator_name);
}
- spin_unlock_irq(
q->queue
_lock);
+ spin_unlock_irq(
&elv_list
_lock);
len += sprintf(len+name, "\n");
return len;
len += sprintf(len+name, "\n");
return len;