dm mpath: tidy ctr
Alasdair G Kergon
maintainerPATCH 13/25 dm mpath: tidy ctr
From: Micha³ Miros³aw <[email protected]>
After initialising m->ti, there's no need to pass it in subsequent calls to static functions used for parsing parameters.
Signed-off-by Micha³ Miros³aw <[email protected]>
Signed-off-by Alasdair G Kergon <[email protected]>
drivers/md/dm-mpath.c +13 -15
@@ -168,7 +168,7 @@ static void free_priority_group(struct pkfree (pg); } -static struct multipath *alloc_multipath (void ) +static struct multipath *alloc_multipath (struct dm_target *ti) {struct multipath *m;
@@ -185,6 +185,8 @@ static struct multipath *alloc_multipathkfree (m);return NULL ; } + m->ti = ti; + ti->private = m; }return m;
@@ -557,8 +559,7 @@ static struct pgpath *parse_path(struct }static struct priority_group *parse_priority_group (struct arg_set *as, -struct multipath *m, -struct dm_target *ti) +struct multipath *m) {static struct param _params[] = { {1 ,1024 ,"invalid number of paths" },
@@ -568,6 +569,7 @@ static struct priority_group *parse_prioint r;unsigned i, nr_selector_args, nr_params;struct priority_group *pg; +struct dm_target *ti = m->ti;if (as->argc <2 ) { as->argc =0 ;
@@ -624,12 +626,12 @@ static struct priority_group *parse_prioreturn NULL ; } -static int parse_hw_handler (struct arg_set *as,struct multipath *m, -struct dm_target *ti) +static int parse_hw_handler (struct arg_set *as,struct multipath *m) {int r;struct hw_handler_type *hwht;unsigned hw_argc; +struct dm_target *ti = m->ti;static struct param _params[] = { {0 ,1024 ,"invalid number of hardware handler args" },
@@ -661,11 +663,11 @@ static int parse_hw_handler(struct arg_sreturn 0 ; } -static int parse_features (struct arg_set *as,struct multipath *m, -struct dm_target *ti) +static int parse_features (struct arg_set *as,struct multipath *m) {int r;unsigned argc; +struct dm_target *ti = m->ti;static struct param _params[] = { {0 ,1 ,"invalid number of feature args" },
@@ -704,19 +706,17 @@ static int multipath_ctr(struct dm_targe as.argc = argc; as.argv = argv; - m =alloc_multipath (); + m =alloc_multipath (ti);if (!m) { ti->error ="can't allocate multipath" ;return -EINVAL ; } - m->ti = ti; - - r =parse_features (&as, m, ti); + r =parse_features (&as, m);if (r) goto bad; - r =parse_hw_handler (&as, m, ti); + r =parse_hw_handler (&as, m);if (r) goto bad;
@@ -732,7 +732,7 @@ static int multipath_ctr(struct dm_targewhile (as.argc) {struct priority_group *pg; - pg =parse_priority_group (&as, m, ti); + pg =parse_priority_group (&as, m);if (!pg) { r = -EINVAL ; goto bad;
@@ -752,8 +752,6 @@ static int multipath_ctr(struct dm_targe goto bad; } - ti->private = m; -return 0 ; bad: