[PATCH] struct path: rename DM's struct path

Rename DM's struct path to struct dm_path to prevent name collision between it
and struct path from fs/namei.c.

Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Acked-by: Alasdair G Kergon <agk@redhat.com>
Cc: <reiserfs-dev@namesys.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/md/dm-path-selector.h b/drivers/md/dm-path-selector.h
index 732d06a84f85..27357b85d73d 100644
--- 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).
          */
-        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);
 
         /*
@@ -55,27 +55,27 @@ struct path_selector_type {
          * 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.
          */
-        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.
          */
-        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
          */
-        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);
 
-        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 */