summaryrefslogtreecommitdiffstats
path: root/include/linux/elevator.h
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-03-18 22:27:18 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2006-03-18 22:27:18 -0500
commite572ec7e4e432de7ecf7bd2e62117646fa64e518 (patch)
tree56b4b738fb566128d2db6d62aed28cfd41b5398a /include/linux/elevator.h
parent3d1ab40f4c20767afbd361b258a531d73e3e6fc2 (diff)
downloadop-kernel-dev-e572ec7e4e432de7ecf7bd2e62117646fa64e518.zip
op-kernel-dev-e572ec7e4e432de7ecf7bd2e62117646fa64e518.tar.gz
[PATCH] fix rmmod problems with elevator attributes, clean them up
Diffstat (limited to 'include/linux/elevator.h')
-rw-r--r--include/linux/elevator.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 4d0a80f..ad133fc 100644
--- 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 attribute **elevator_attrs;
+ struct elv_fs_entry *elevator_attrs;
char elevator_name[ELV_NAME_MAX];
struct module *elevator_owner;
};
@@ -142,12 +148,6 @@ enum {
ELV_MQUEUE_MUST,
};
-struct elv_fs_entry {
- struct attribute attr;
- ssize_t (*show)(elevator_t *, char *);
- ssize_t (*store)(elevator_t *, const char *, size_t);
-};
-
#define rq_end_sector(rq) ((rq)->sector + (rq)->nr_sectors)
#endif
OpenPOWER on IntegriCloud