Correctly ignore empty prio names
PATCH 1/1 Correctly ignore empty prio names
This is a partial revert of commit
'Stop annoying prio_lookup warning messages', as that patch would only fix the 'prio_put' case. However, as the prio name might be empty even in in prio_get() we should rather fix this in prio_lookup() and handle both cases.
libmultipath/prio.c +4 -4
@@ -64,6 +64,9 @@ struct prio * prio_lookup (char * name) {struct prio * p; +if (!name || !strlen (name)) +return NULL ; +list_for_each_entry (p, &prioritizers, node) {if (!strncmp (name, p->name,PRIO_NAME_LEN ))return p;
@@ -162,10 +165,7 @@ void prio_put (struct prio * dst)if (!dst)return ; -if (!strlen (dst->name)) - src =NULL ; -else - src =prio_lookup (dst->name); + src =prio_lookup (dst->name);memset (dst,0x0 ,sizeof (struct prio ));free_prio (src); }
Quoted 7 lines · Hannes Reinecke
This is a partial revert of commit
'Stop annoyingprio_lookupwarning messages', as that patch would only fix the 'prio_put' case. However, as the prio name might be empty even in inprio_get()we should rather fix this inprio_lookup()and handle both cases.
Sorry I overlooked your comments on this patch.
Applied.
Quoted 28 lines
Signed-off-by Hannes Reinecke <[email protected]>libmultipath/prio.c +4
-4@@ -64,6 +64,9 @@ struct prio * prio_lookup (char * name) {struct prio * p; +if (!name || !strlen (name)) +return NULL ; +list_for_each_entry (p, &prioritizers, node) {if (!strncmp (name, p->name,PRIO_NAME_LEN ))return p;@@ -162,10 +165,7 @@ void prio_put (struct prio * dst)if (!dst)return ; -if (!strlen (dst->name)) - src =NULL ; -else - src =prio_lookup (dst->name); + src =prio_lookup (dst->name);memset (dst,0x0 ,sizeof (struct prio ));free_prio (src); }
Benjamin Marzinski
maintainerQuoted 6 lines · Hannes Reinecke
This is a partial revert of commit
'Stop annoyingprio_lookupwarning messages', as that patch would only fix the 'prio_put' case. However, as the prio name might be empty even in inprio_get()we should rather fix this inprio_lookup()and handle both cases.
My feeling was that you would want to get that warning message if you failed to get the prioritizer in prio_get() because the name was empty. With this change it will silently fail unless you have the verbosity set to 3, in which case you'll get a message like
sdb: prio = (config file default)
Which doesn't really look that much like an error.
On the other hand, if you never got a prioritizer at all, you don't want a warning message when you try to free it in prio_put() since that's only happening because there is nothing to free.
What you you think?
-Ben
Quoted 29 lines
Signed-off-by Hannes Reinecke <[email protected]>libmultipath/prio.c +4
-4@@ -64,6 +64,9 @@ struct prio * prio_lookup (char * name) {struct prio * p; +if (!name || !strlen (name)) +return NULL ; +list_for_each_entry (p, &prioritizers, node) {if (!strncmp (name, p->name,PRIO_NAME_LEN ))return p;@@ -162,10 +165,7 @@ void prio_put (struct prio * dst)if (!dst)return ; -if (!strlen (dst->name)) - src =NULL ; -else - src =prio_lookup (dst->name); + src =prio_lookup (dst->name);memset (dst,0x0 ,sizeof (struct prio ));free_prio (src); }
Quoted 8 lines · Benjamin Marzinski
Quoted 6 lines · Hannes Reinecke
This is a partial revert of commit
'Stop annoyingprio_lookupwarning messages', as that patch would only fix the 'prio_put' case. However, as the prio name might be empty even in inprio_get()we should rather fix this inprio_lookup()and handle both cases.
Quoted 9 lines
My feeling was that you would want to get that warning message if you failed to get the prioritizer in
prio_get()because the name was empty. With this change it will silently fail unless you have the verbosity set to 3, in which case you'll get a message likesdb: prio = (config file default)
Which doesn't really look that much like an error.
Yeah, one should modify this message.
Quoted 4 lines
On the other hand, if you never got a prioritizer at all, you don't want a warning message when you try to free it in
prio_put()since that's only happening because there is nothing to free.
I'd rather have the functions to do the correct thing. We've had tons and tons of issues with multipathing just because no-one ever checked the function arguments.
So we should not be introducing this behaviour again.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)