Commit 0ce72d4f7333248efbef1f3309770c7edb1b2625
Committed by
Linus Torvalds
1 parent
4a5b18cc19
Exists in
master
and in
20 other branches
mm: do_migrate_pages(): rename arguments
s/from_nodes/from and s/to_nodes/to/. The "_nodes" is redundant - it duplicates the argument's type. Done in a fit of irritation over 80-col issues :( Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <mkosaki@redhat.com> Cc: Larry Woodman <lwoodman@redhat.com> Cc: Mel Gorman <mel@csn.ul.ie> Cc: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 2 changed files with 13 additions and 14 deletions Side-by-side Diff
include/linux/mempolicy.h
... | ... | @@ -225,8 +225,8 @@ |
225 | 225 | policy_zone = k; |
226 | 226 | } |
227 | 227 | |
228 | -int do_migrate_pages(struct mm_struct *mm, | |
229 | - const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags); | |
228 | +int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from, | |
229 | + const nodemask_t *to, int flags); | |
230 | 230 | |
231 | 231 | |
232 | 232 | #ifdef CONFIG_TMPFS |
... | ... | @@ -354,9 +354,8 @@ |
354 | 354 | return false; |
355 | 355 | } |
356 | 356 | |
357 | -static inline int do_migrate_pages(struct mm_struct *mm, | |
358 | - const nodemask_t *from_nodes, | |
359 | - const nodemask_t *to_nodes, int flags) | |
357 | +static inline int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from, | |
358 | + const nodemask_t *to, int flags) | |
360 | 359 | { |
361 | 360 | return 0; |
362 | 361 | } |
mm/mempolicy.c
... | ... | @@ -950,8 +950,8 @@ |
950 | 950 | * |
951 | 951 | * Returns the number of page that could not be moved. |
952 | 952 | */ |
953 | -int do_migrate_pages(struct mm_struct *mm, | |
954 | - const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) | |
953 | +int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from, | |
954 | + const nodemask_t *to, int flags) | |
955 | 955 | { |
956 | 956 | int busy = 0; |
957 | 957 | int err; |
... | ... | @@ -963,7 +963,7 @@ |
963 | 963 | |
964 | 964 | down_read(&mm->mmap_sem); |
965 | 965 | |
966 | - err = migrate_vmas(mm, from_nodes, to_nodes, flags); | |
966 | + err = migrate_vmas(mm, from, to, flags); | |
967 | 967 | if (err) |
968 | 968 | goto out; |
969 | 969 | |
... | ... | @@ -998,7 +998,7 @@ |
998 | 998 | * moved to an empty node, then there is nothing left worth migrating. |
999 | 999 | */ |
1000 | 1000 | |
1001 | - tmp = *from_nodes; | |
1001 | + tmp = *from; | |
1002 | 1002 | while (!nodes_empty(tmp)) { |
1003 | 1003 | int s,d; |
1004 | 1004 | int source = -1; |
1005 | 1005 | |
... | ... | @@ -1021,11 +1021,11 @@ |
1021 | 1021 | * [0-7] - > [3,4,5] moves only 0,1,2,6,7. |
1022 | 1022 | */ |
1023 | 1023 | |
1024 | - if ((nodes_weight(*from_nodes) != nodes_weight(*to_nodes)) && | |
1025 | - (node_isset(s, *to_nodes))) | |
1024 | + if ((nodes_weight(*from) != nodes_weight(*to)) && | |
1025 | + (node_isset(s, *to))) | |
1026 | 1026 | continue; |
1027 | 1027 | |
1028 | - d = node_remap(s, *from_nodes, *to_nodes); | |
1028 | + d = node_remap(s, *from, *to); | |
1029 | 1029 | if (s == d) |
1030 | 1030 | continue; |
1031 | 1031 | |
... | ... | @@ -1085,8 +1085,8 @@ |
1085 | 1085 | { |
1086 | 1086 | } |
1087 | 1087 | |
1088 | -int do_migrate_pages(struct mm_struct *mm, | |
1089 | - const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags) | |
1088 | +int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from, | |
1089 | + const nodemask_t *to, int flags) | |
1090 | 1090 | { |
1091 | 1091 | return -ENOSYS; |
1092 | 1092 | } |