Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c922d5f7 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[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: default avatarJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Acked-by: default avatarAlasdair G Kergon <agk@redhat.com>
Cc: <reiserfs-dev@namesys.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fec6d055

drivers/md/dm-emc.c

+5 −5
Original line number Diff line number Diff line
@@ -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)

{

	struct path *path = bio->bi_private;

	struct dm_path *path = bio->bi_private;



	if (bio->bi_size)

		return 1;
@@ -61,7 +61,7 @@ static int emc_endio(struct bio *bio, unsigned int bytes_done, int error) 
	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 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,

					struct bio *bio, struct path *path)

					struct bio *bio, struct dm_path *path)

{

	struct request *rq;

	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,

					struct path *path)

					struct dm_path *path)

{

	struct bio *bio;

	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,

			struct path *path)

			struct dm_path *path)

{

	struct request *rq;

	struct request_queue *q = bdev_get_queue(path->dev->bdev);

drivers/md/dm-hw-handler.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct hw_handler_type { 
	void (*destroy) (struct hw_handler *hwh);



	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);

	int (*status) (struct hw_handler *hwh, status_type_t type,

		       char *result, unsigned int maxlen);

drivers/md/dm-mpath.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/md/dm-mpath.h

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


struct dm_dev;



struct path {

struct dm_path {

	struct dm_dev *dev;	/* Read-only */

	unsigned is_active;	/* Read-only */
@@ -20,6 +20,6 @@ struct path { 
};



/* 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

drivers/md/dm-path-selector.h

+6 −6
Original line number Diff line number Diff line
@@ -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 */