[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>
This commit is contained in:
committed by
Linus Torvalds
parent
fec6d055da
commit
c922d5f7f5
@ -31,7 +31,7 @@ struct pgpath {
|
||||
struct priority_group *pg; /* Owning PG */
|
||||
unsigned fail_count; /* Cumulative failure count */
|
||||
|
||||
struct path path;
|
||||
struct dm_path path;
|
||||
};
|
||||
|
||||
#define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, path)
|
||||
@ -229,7 +229,7 @@ static void __switch_pg(struct multipath *m, struct pgpath *pgpath)
|
||||
|
||||
static int __choose_path_in_pg(struct multipath *m, struct priority_group *pg)
|
||||
{
|
||||
struct path *path;
|
||||
struct dm_path *path;
|
||||
|
||||
path = pg->ps.type->select_path(&pg->ps, &m->repeat_count);
|
||||
if (!path)
|
||||
@ -957,7 +957,7 @@ static int bypass_pg_num(struct multipath *m, const char *pgstr, int bypassed)
|
||||
/*
|
||||
* pg_init must call this when it has completed its initialisation
|
||||
*/
|
||||
void dm_pg_init_complete(struct path *path, unsigned err_flags)
|
||||
void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
|
||||
{
|
||||
struct pgpath *pgpath = path_to_pgpath(path);
|
||||
struct priority_group *pg = pgpath->pg;
|
||||
|
Reference in New Issue
Block a user