ext4: Use kstrtoul() instead of parse_strtoul()
PATCH 1/1 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 Lukas Czerner <[email protected]>
--- fs/ext4/super.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-)
fs/ext4/super.c +9 -18
@@ -2382,19 +2382,6 @@ struct ext4_attr {int offset; }; -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,struct ext4_sb_info *sbi,char *buf)
@@ -2434,11 +2421,13 @@ static ssize_t inode_readahead_blks_store(struct ext4_attr *a, const char *buf, size_t count) { unsigned long t; +int ret; -if (parse_strtoul (buf,0x40000000 , &t)) -return -EINVAL ; + ret =kstrtoul (skip_spaces (buf),0 , &t); +if (ret) +return ret; -if (t && !is_power_of_2 (t)) +if (t && (!is_power_of_2 (t) || t >0x40000000 ))return -EINVAL ; sbi->s_inode_readahead_blks = t;
@@ -2459,9 +2448,11 @@ static ssize_t sbi_ui_store(struct ext4_attr *a, {unsigned int *ui = (unsigned int *) (((char *) sbi) + a->offset);unsigned long t; +int ret; -if (parse_strtoul (buf,0xffffffff , &t)) -return -EINVAL ; + ret =kstrtoul (skip_spaces (buf),0 , &t); +if (ret) +return ret; *ui = t;return count; }
Signature · 1 line
1.7.7.6
Quoted 4 lines · Lukas Czerner
In
parse_strtoul()we're still using deprecatedsimple_strtoul(). Removeparse_strtoul()altogether and replace it withkstrtoul()Signed-off-by Lukas Czerner <[email protected]>
Thanks, applied.
- Ted