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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
md
/
dm-path-selector.h
diff --git
a/drivers/md/dm-path-selector.h
b/drivers/md/dm-path-selector.h
index
732d06a
..
27357b8
100644
(file)
--- a/
drivers/md/dm-path-selector.h
+++ b/
drivers/md/dm-path-selector.h
@@
-44,7
+44,7
@@
struct path_selector_type {
* Add an opaque path object, along with some selector specific
* path args (eg, path priority).
*/
* Add an opaque path object, along with some selector specific
* path args (eg, path priority).
*/
- int (*add_path) (struct path_selector *ps, struct path *path,
+ int (*add_path) (struct path_selector *ps, struct
dm_
path *path,
int argc, char **argv, char **error);
/*
int argc, char **argv, char **error);
/*
@@
-55,27
+55,27
@@
struct path_selector_type {
* calling the function again. 0 means don't call it again unless
* the path fails.
*/
* calling the function again. 0 means don't call it again unless
* the path fails.
*/
- struct path *(*select_path) (struct path_selector *ps,
+ struct
dm_
path *(*select_path) (struct path_selector *ps,
unsigned *repeat_count);
/*
* Notify the selector that a path has failed.
*/
unsigned *repeat_count);
/*
* Notify the selector that a path has failed.
*/
- void (*fail_path) (struct path_selector *ps, struct path *p);
+ void (*fail_path) (struct path_selector *ps, struct
dm_
path *p);
/*
* Ask selector to reinstate a path.
*/
/*
* Ask selector to reinstate a path.
*/
- int (*reinstate_path) (struct path_selector *ps, struct path *p);
+ int (*reinstate_path) (struct path_selector *ps, struct
dm_
path *p);
/*
* Table content based on parameters added in ps_add_path_fn
* or path selector status
*/
/*
* Table content based on parameters added in ps_add_path_fn
* or path selector status
*/
- int (*status) (struct path_selector *ps, struct path *path,
+ int (*status) (struct path_selector *ps, struct
dm_
path *path,
status_type_t type, char *result, unsigned int maxlen);
status_type_t type, char *result, unsigned int maxlen);
- int (*end_io) (struct path_selector *ps, struct path *path);
+ int (*end_io) (struct path_selector *ps, struct
dm_
path *path);
};
/* Register a path selector */
};
/* Register a path selector */