Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / elevator.h

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index f65766ef053290ba94c93a5302c891e150284563..ad133fcfb239ddbf16e6961e88f47161e8d1447e 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -53,6 +53,12 @@ struct elevator_ops
 
 #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
  */
@@ -61,7 +67,7 @@ struct elevator_type
        struct list_head list;
        struct elevator_ops ops;
        struct elevator_type *elevator_type;
-       struct kobj_type *elevator_ktype;
+       struct elv_fs_entry *elevator_attrs;
        char elevator_name[ELV_NAME_MAX];
        struct module *elevator_owner;
 };
@@ -75,6 +81,7 @@ struct elevator_queue
        void *elevator_data;
        struct kobject kobj;
        struct elevator_type *elevator_type;
+       struct mutex sysfs_lock;
 };
 
 /*