UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm: replace simple_strtoul 

Replace obsolete simple_strtoul() with kstrtou8/kstrtouint.

Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
majianpeng 2012-07-27 15:07:59 +01:00 committed by Alasdair G Kergon
parent 70c4861102
commit 1a66a08ae8
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/md/dm-crypt.c
View File

@ -1241,7 +1241,6 @@ static void kcryptd_queue_crypt(struct dm_crypt_io *io)
static int crypt_decode_key(u8 *key, char *hex, unsigned int size) static int crypt_decode_key(u8 *key, char *hex, unsigned int size)
{ {
char buffer[3]; char buffer[3];
char *endp;
unsigned int i; unsigned int i;
buffer[2] = '\0'; buffer[2] = '\0';
@ -1250,9 +1249,7 @@ static int crypt_decode_key(u8 *key, char *hex, unsigned int size)
buffer[0] = *hex++; buffer[0] = *hex++;
buffer[1] = *hex++; buffer[1] = *hex++;
key[i] = (u8)simple_strtoul(buffer, &endp, 16); if (kstrtou8(buffer, 16, &key[i]))
if (endp != &buffer[2])
return -EINVAL; return -EINVAL;
} }

13
drivers/md/dm-exception-store.c
View File

@ -142,24 +142,19 @@ EXPORT_SYMBOL(dm_exception_store_type_unregister);
static int set_chunk_size(struct dm_exception_store *store, static int set_chunk_size(struct dm_exception_store *store,
const char *chunk_size_arg, char **error) const char *chunk_size_arg, char **error)
{ {
unsigned long chunk_size_ulong; unsigned chunk_size;
char *value;
chunk_size_ulong = simple_strtoul(chunk_size_arg, &value, 10); if (kstrtouint(chunk_size_arg, 10, &chunk_size)) {
if (*chunk_size_arg == '\0' || *value != '\0' ||
chunk_size_ulong > UINT_MAX) {
*error = "Invalid chunk size"; *error = "Invalid chunk size";
return -EINVAL; return -EINVAL;
} }
if (!chunk_size_ulong) { if (!chunk_size) {
store->chunk_size = store->chunk_mask = store->chunk_shift = 0; store->chunk_size = store->chunk_mask = store->chunk_shift = 0;
return 0; return 0;
} }
return dm_exception_store_set_chunk_size(store, return dm_exception_store_set_chunk_size(store, chunk_size, error);
(unsigned) chunk_size_ulong,
error);
} }
int dm_exception_store_set_chunk_size(struct dm_exception_store *store, int dm_exception_store_set_chunk_size(struct dm_exception_store *store,

7
drivers/md/dm-stripe.c
View File

@ -99,7 +99,6 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
sector_t width; sector_t width;
uint32_t stripes; uint32_t stripes;
uint32_t chunk_size; uint32_t chunk_size;
char *end;
int r; int r;
unsigned int i; unsigned int i;
@ -108,14 +107,12 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
return -EINVAL; return -EINVAL;
} }
stripes = simple_strtoul(argv[0], &end, 10); if (kstrtouint(argv[0], 10, &stripes) || !stripes) {
if (!stripes || *end) {
ti->error = "Invalid stripe count"; ti->error = "Invalid stripe count";
return -EINVAL; return -EINVAL;
} }
chunk_size = simple_strtoul(argv[1], &end, 10); if (kstrtouint(argv[1], 10, &chunk_size)) {
if (*end) {
ti->error = "Invalid chunk_size"; ti->error = "Invalid chunk_size";
return -EINVAL; return -EINVAL;
} }