Commit e1091b15 authored by Lukas Czerner's avatar Lukas Czerner Committed by Theodore Ts'o

ext4: Use kstrtoul() instead of parse_strtoul()

In parse_strtoul() we're still using deprecated simple_strtoul().  Remove
parse_strtoul() altogether and replace it with kstrtoul()
Signed-off-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 7e8b12c6
...@@ -2394,19 +2394,6 @@ static int parse_strtoull(const char *buf, ...@@ -2394,19 +2394,6 @@ static int parse_strtoull(const char *buf,
return ret; return ret;
} }
static int parse_strtoul(const char *buf,
unsigned long max, unsigned long *value)
{
char *endp;
*value = simple_strtoul(skip_spaces(buf), &endp, 0);
endp = skip_spaces(endp);
if (*endp || *value > max)
return -EINVAL;
return 0;
}
static ssize_t delayed_allocation_blocks_show(struct ext4_attr *a, static ssize_t delayed_allocation_blocks_show(struct ext4_attr *a,
struct ext4_sb_info *sbi, struct ext4_sb_info *sbi,
char *buf) char *buf)
...@@ -2446,11 +2433,13 @@ static ssize_t inode_readahead_blks_store(struct ext4_attr *a, ...@@ -2446,11 +2433,13 @@ static ssize_t inode_readahead_blks_store(struct ext4_attr *a,
const char *buf, size_t count) const char *buf, size_t count)
{ {
unsigned long t; unsigned long t;
int ret;
if (parse_strtoul(buf, 0x40000000, &t)) ret = kstrtoul(skip_spaces(buf), 0, &t);
return -EINVAL; if (ret)
return ret;
if (t && !is_power_of_2(t)) if (t && (!is_power_of_2(t) || t > 0x40000000))
return -EINVAL; return -EINVAL;
sbi->s_inode_readahead_blks = t; sbi->s_inode_readahead_blks = t;
...@@ -2471,9 +2460,11 @@ static ssize_t sbi_ui_store(struct ext4_attr *a, ...@@ -2471,9 +2460,11 @@ static ssize_t sbi_ui_store(struct ext4_attr *a,
{ {
unsigned int *ui = (unsigned int *) (((char *) sbi) + a->offset); unsigned int *ui = (unsigned int *) (((char *) sbi) + a->offset);
unsigned long t; unsigned long t;
int ret;
if (parse_strtoul(buf, 0xffffffff, &t)) ret = kstrtoul(skip_spaces(buf), 0, &t);
return -EINVAL; if (ret)
return ret;
*ui = t; *ui = t;
return count; return count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment