git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
linux
/
elevator.h
diff --git
a/include/linux/elevator.h
b/include/linux/elevator.h
index
1713ace
..
18cf1f3
100644
(file)
--- a/
include/linux/elevator.h
+++ b/
include/linux/elevator.h
@@
-21,7
+21,7
@@
typedef void (elevator_put_req_fn) (request_queue_t *, struct request *);
typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
typedef void (elevator_activate_req_fn) (request_queue_t *, struct request *);
typedef void (elevator_deactivate_req_fn) (request_queue_t *, struct request *);
-typedef
void *
(elevator_init_fn) (request_queue_t *, elevator_t *);
+typedef
int
(elevator_init_fn) (request_queue_t *, elevator_t *);
typedef void (elevator_exit_fn) (elevator_t *);
struct elevator_ops
typedef void (elevator_exit_fn) (elevator_t *);
struct elevator_ops
@@
-48,17
+48,10
@@
struct elevator_ops
elevator_init_fn *elevator_init_fn;
elevator_exit_fn *elevator_exit_fn;
elevator_init_fn *elevator_init_fn;
elevator_exit_fn *elevator_exit_fn;
- void (*trim)(struct io_context *);
};
#define ELV_NAME_MAX (16)
};
#define ELV_NAME_MAX (16)
-struct elv_fs_entry {
- struct attribute attr;
- ssize_t (*show)(elevator_t *, char *);
- ssize_t (*store)(elevator_t *, const char *, size_t);
-};
-
/*
* identifies an elevator type, such as AS or deadline
*/
/*
* identifies an elevator type, such as AS or deadline
*/
@@
-67,7
+60,7
@@
struct elevator_type
struct list_head list;
struct elevator_ops ops;
struct elevator_type *elevator_type;
struct list_head list;
struct elevator_ops ops;
struct elevator_type *elevator_type;
- struct
elv_fs_entry *elevator_attrs
;
+ struct
kobj_type *elevator_ktype
;
char elevator_name[ELV_NAME_MAX];
struct module *elevator_owner;
};
char elevator_name[ELV_NAME_MAX];
struct module *elevator_owner;
};
@@
-81,7
+74,6
@@
struct elevator_queue
void *elevator_data;
struct kobject kobj;
struct elevator_type *elevator_type;
void *elevator_data;
struct kobject kobj;
struct elevator_type *elevator_type;
- struct mutex sysfs_lock;
};
/*
};
/*