X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Felevator.h;h=18cf1f3e11845dd6ba28f81b3defd2e4ed52adff;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=1713ace808bfb4d581ccfff53aa4b0c42ebfa9ef;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 1713ace80..18cf1f3e1 100644
--- 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_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
@@ -48,17 +48,10 @@ struct elevator_ops
 
 	elevator_init_fn *elevator_init_fn;
 	elevator_exit_fn *elevator_exit_fn;
-	void (*trim)(struct io_context *);
 };
 
 #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
  */
@@ -67,7 +60,7 @@ struct 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;
 };
@@ -81,7 +74,6 @@ struct elevator_queue
 	void *elevator_data;
 	struct kobject kobj;
 	struct elevator_type *elevator_type;
-	struct mutex sysfs_lock;
 };
 
 /*