An error in parse_size() should be reported by 0, not -1,
because -1 is changed to the max value of unsigned long long
during calculations of size (e.g. at mdadm.c:412).
A negative value of size should be reported as error
(e.g. size equal -1 has been changed to the max value of
unsigned long long so far).
Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
extern int md_get_version(int fd);
extern int get_linux_version(void);
extern int mdadm_version(char *version);
-extern long long parse_size(char *size);
+extern unsigned long long parse_size(char *size);
extern int parse_uuid(char *str, int uuid[4]);
extern int parse_layout_10(char *layout);
extern int parse_layout_faulty(char *layout);
return (a*1000000)+(b*1000)+c;
}
-long long parse_size(char *size)
+unsigned long long parse_size(char *size)
{
/* parse 'size' which should be a number optionally
* followed by 'K', 'M', or 'G'.
* Without a suffix, K is assumed.
* Number returned is in sectors (half-K)
- * -1 returned on error.
+ * 0 returned on error.
*/
char *c;
long long s = strtoll(size, &c, 10);
s *= 1024 * 1024 * 2;
break;
}
- }
+ } else
+ s = 0;
if (*c)
- s = -1;
+ s = 0;
return s;
}