Because madise_should_skip() logic is factored out, making
madvise_do_behavior() calculates 'len' on its own rather then receiving
it as a parameter makes code simpler. Remove the parameter.
Signed-off-by: SeongJae Park <sj@xxxxxxxxxx>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx>
---
mm/madvise.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/mm/madvise.c b/mm/madvise.c
index ba006d05c7ea..b17f684322ad 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -1677,7 +1677,7 @@ static bool is_madvise_populate(int behavior)
}
static int madvise_do_behavior(struct mm_struct *mm,
- unsigned long start, size_t len_in, size_t len, int behavior)
+ unsigned long start, size_t len_in, int behavior)
{
struct blk_plug plug;
unsigned long end;
@@ -1686,7 +1686,7 @@ static int madvise_do_behavior(struct mm_struct *mm,
if (is_memory_failure(behavior))
return madvise_inject_error(behavior, start, start + len_in);
start = untagged_addr_remote(mm, start);
- end = start + len;
+ end = start + PAGE_ALIGN(len_in);
blk_start_plug(&plug);
if (is_madvise_populate(behavior))
@@ -1779,8 +1779,7 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh
error = madvise_lock(mm, behavior);
if (error)
return error;
- error = madvise_do_behavior(mm, start, len_in, PAGE_ALIGN(len_in),
- behavior);
+ error = madvise_do_behavior(mm, start, len_in, behavior);
madvise_unlock(mm, behavior);
return error;
@@ -1812,8 +1811,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter,
if (madvise_should_skip(start, len_in, behavior, &error))
ret = error;
else
- ret = madvise_do_behavior(mm, start, len_in,
- PAGE_ALIGN(len_in), behavior);
+ ret = madvise_do_behavior(mm, start, len_in, behavior);
/*
* An madvise operation is attempting to restart the syscall,
* but we cannot proceed as it would not be correct to repeat
--
2.39.5
