OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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:
Josef "Jeff" Sipek 2006-12-08 02:36:33 -08:00 committed by Linus Torvalds
parent fec6d055da
commit c922d5f7f5
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/md/dm-emc.c
View File

@ -40,7 +40,7 @@ static inline void free_bio(struct bio *bio)
static int emc_endio(struct bio *bio, unsigned int bytes_done, int error) static int emc_endio(struct bio *bio, unsigned int bytes_done, int error)
{ {
struct path *path = bio->bi_private; struct dm_path *path = bio->bi_private;
if (bio->bi_size) if (bio->bi_size)
return 1; return 1;
@ -61,7 +61,7 @@ static int emc_endio(struct bio *bio, unsigned int bytes_done, int error)
return 0; return 0;
} }
static struct bio *get_failover_bio(struct path *path, unsigned data_size) static struct bio *get_failover_bio(struct dm_path *path, unsigned data_size)
{ {
struct bio *bio; struct bio *bio;
struct page *page; struct page *page;
@ -96,7 +96,7 @@ static struct bio *get_failover_bio(struct path *path, unsigned data_size)
} }
static struct request *get_failover_req(struct emc_handler *h, static struct request *get_failover_req(struct emc_handler *h,
struct bio *bio, struct path *path) struct bio *bio, struct dm_path *path)
{ {
struct request *rq; struct request *rq;
struct block_device *bdev = bio->bi_bdev; struct block_device *bdev = bio->bi_bdev;
@ -133,7 +133,7 @@ static struct request *get_failover_req(struct emc_handler *h,
} }
static struct request *emc_trespass_get(struct emc_handler *h, static struct request *emc_trespass_get(struct emc_handler *h,
struct path *path) struct dm_path *path)
{ {
struct bio *bio; struct bio *bio;
struct request *rq; struct request *rq;
@ -191,7 +191,7 @@ static struct request *emc_trespass_get(struct emc_handler *h,
} }
static void emc_pg_init(struct hw_handler *hwh, unsigned bypassed, static void emc_pg_init(struct hw_handler *hwh, unsigned bypassed,
struct path *path) struct dm_path *path)
{ {
struct request *rq; struct request *rq;
struct request_queue *q = bdev_get_queue(path->dev->bdev); struct request_queue *q = bdev_get_queue(path->dev->bdev);

2
drivers/md/dm-hw-handler.h
View File

@ -32,7 +32,7 @@ struct hw_handler_type {
void (*destroy) (struct hw_handler *hwh); void (*destroy) (struct hw_handler *hwh);
void (*pg_init) (struct hw_handler *hwh, unsigned bypassed, void (*pg_init) (struct hw_handler *hwh, unsigned bypassed,
struct path *path); struct dm_path *path);
unsigned (*error) (struct hw_handler *hwh, struct bio *bio); unsigned (*error) (struct hw_handler *hwh, struct bio *bio);
int (*status) (struct hw_handler *hwh, status_type_t type, int (*status) (struct hw_handler *hwh, status_type_t type,
char *result, unsigned int maxlen); char *result, unsigned int maxlen);

6
drivers/md/dm-mpath.c
View File

@ -31,7 +31,7 @@ struct pgpath {
struct priority_group *pg; /* Owning PG */ struct priority_group *pg; /* Owning PG */
unsigned fail_count; /* Cumulative failure count */ unsigned fail_count; /* Cumulative failure count */
struct path path; struct dm_path path;
}; };
#define path_to_pgpath(__pgp) container_of((__pgp), struct pgpath, 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) 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); path = pg->ps.type->select_path(&pg->ps, &m->repeat_count);
if (!path) 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 * 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 pgpath *pgpath = path_to_pgpath(path);
struct priority_group *pg = pgpath->pg; struct priority_group *pg = pgpath->pg;

4
drivers/md/dm-mpath.h
View File

@ -11,7 +11,7 @@
struct dm_dev; struct dm_dev;
struct path { struct dm_path {
struct dm_dev *dev; /* Read-only */ struct dm_dev *dev; /* Read-only */
unsigned is_active; /* Read-only */ unsigned is_active; /* Read-only */
@ -20,6 +20,6 @@ struct path {
}; };
/* Callback for hwh_pg_init_fn to use when complete */ /* Callback for hwh_pg_init_fn to use when complete */
void dm_pg_init_complete(struct path *path, unsigned err_flags); void dm_pg_init_complete(struct dm_path *path, unsigned err_flags);
#endif #endif

12
drivers/md/dm-path-selector.h
View File

@ -44,7 +44,7 @@ struct path_selector_type {
* Add an opaque path object, along with some selector specific * Add an opaque path object, along with some selector specific
* path args (eg, path priority). * 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 * calling the function again. 0 means don't call it again unless
* the path fails. * the path fails.
*/ */
struct path *(*select_path) (struct path_selector *ps, struct dm_path *(*select_path) (struct path_selector *ps,
unsigned *repeat_count); unsigned *repeat_count);
/* /*
* Notify the selector that a path has failed. * 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 * Table content based on parameters added in ps_add_path_fn
* or path selector status * 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 */

12
drivers/md/dm-round-robin.c
View File

@ -21,7 +21,7 @@
*---------------------------------------------------------------*/ *---------------------------------------------------------------*/
struct path_info { struct path_info {
struct list_head list; struct list_head list;
struct path *path; struct dm_path *path;
unsigned repeat_count; unsigned repeat_count;
}; };
@ -80,7 +80,7 @@ static void rr_destroy(struct path_selector *ps)
ps->context = NULL; ps->context = NULL;
} }
static int rr_status(struct path_selector *ps, struct path *path, static int rr_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)
{ {
struct path_info *pi; struct path_info *pi;
@ -106,7 +106,7 @@ static int rr_status(struct path_selector *ps, struct path *path,
* Called during initialisation to register each path with an * Called during initialisation to register each path with an
* optional repeat_count. * optional repeat_count.
*/ */
static int rr_add_path(struct path_selector *ps, struct path *path, static int rr_add_path(struct path_selector *ps, struct dm_path *path,
int argc, char **argv, char **error) int argc, char **argv, char **error)
{ {
struct selector *s = (struct selector *) ps->context; struct selector *s = (struct selector *) ps->context;
@ -141,7 +141,7 @@ static int rr_add_path(struct path_selector *ps, struct path *path,
return 0; return 0;
} }
static void rr_fail_path(struct path_selector *ps, struct path *p) static void rr_fail_path(struct path_selector *ps, struct dm_path *p)
{ {
struct selector *s = (struct selector *) ps->context; struct selector *s = (struct selector *) ps->context;
struct path_info *pi = p->pscontext; struct path_info *pi = p->pscontext;
@ -149,7 +149,7 @@ static void rr_fail_path(struct path_selector *ps, struct path *p)
list_move(&pi->list, &s->invalid_paths); list_move(&pi->list, &s->invalid_paths);
} }
static int rr_reinstate_path(struct path_selector *ps, struct path *p) static int rr_reinstate_path(struct path_selector *ps, struct dm_path *p)
{ {
struct selector *s = (struct selector *) ps->context; struct selector *s = (struct selector *) ps->context;
struct path_info *pi = p->pscontext; struct path_info *pi = p->pscontext;
@ -159,7 +159,7 @@ static int rr_reinstate_path(struct path_selector *ps, struct path *p)
return 0; return 0;
} }
static struct path *rr_select_path(struct path_selector *ps, static struct dm_path *rr_select_path(struct path_selector *ps,
unsigned *repeat_count) unsigned *repeat_count)
{ {
struct selector *s = (struct selector *) ps->context; struct selector *s = (struct selector *) ps->context;