From: Andrew Morton Date: Mon, 16 Dec 2024 05:44:47 +0000 (-0800) Subject: mm/huge_memory.c: rename shadowed local X-Git-Tag: microblaze-v6.16~78^2~194 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1fc10653552c17b9f336a81014f20465e664a2ec;p=linux-2.6-microblaze.git mm/huge_memory.c: rename shadowed local split_huge_pages_write() has a lccal `buf' which shadows incoming arg `buf'. Reviewer confusion resulted. Rename the inner local to `tok_buf'. Cc: Leo Stone Signed-off-by: Andrew Morton --- diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6d87db53db33..2654a9548749 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4181,20 +4181,21 @@ static ssize_t split_huge_pages_write(struct file *file, const char __user *buf, if (input_buf[0] == '/') { char *tok; - char *buf = input_buf; + char *tok_buf = input_buf; char file_path[MAX_INPUT_BUF_SZ]; pgoff_t off_start = 0, off_end = 0; size_t input_len = strlen(input_buf); - tok = strsep(&buf, ","); - if (tok && buf) { + tok = strsep(&tok_buf, ","); + if (tok && tok_buf) { strscpy(file_path, tok); } else { ret = -EINVAL; goto out; } - ret = sscanf(buf, "0x%lx,0x%lx,%d", &off_start, &off_end, &new_order); + ret = sscanf(tok_buf, "0x%lx,0x%lx,%d", &off_start, + &off_end, &new_order); if (ret != 2 && ret != 3) { ret = -EINVAL; goto out;