Skip to contentSkip to conversation

mm: thrashing control cleanups

PATCH New Pekka Enberg 2 participants 2 messages Mar 26, 2005 Memory management

lore
Share & tools
lore

Pekka Enberg

author
#0 lore raw

PATCH 1/1 mm: thrashing control cleanups

Hi,

This patch removes one redundant variable from mm/thrash.c and moves the declaration of one variable closer to the block where it is actually used.

Signed-off-by Pekka Enberg <[email protected]>

---

 thrash.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
2.6/mm/thrash.c +3 -6
Index: kernel/2.6/mm/thrash.c
===================================================================
@@ -51,9 +51,6 @@
  */
 void grab_swap_token(void)
 {
-	struct mm_struct *mm;
-	int reason;
-
 	/* We have the token. Let others know we still need it. */
 	if (has_swap_token(current->mm)) {
 		current->mm->recent_pagein = 1;

@@ -61,6 +58,7 @@
 	}
 
 	if (time_after(jiffies, swap_token_check)) {
+		int reason;
 
 		/* Can't get swapout protection if we exceed our RSS limit. */
 		// if (current->mm->rss > current->mm->rlimit_rss)

@@ -75,13 +73,12 @@
 
 		swap_token_check = jiffies + SWAP_TOKEN_CHECK_INTERVAL;
 
-		mm = swap_token_mm;
-		if ((reason = should_release_swap_token(mm))) {
+		if ((reason = should_release_swap_token(swap_token_mm))) {
 			unsigned long eligible = jiffies;
 			if (reason == SWAP_TOKEN_TIMED_OUT) {
 				eligible += swap_token_default_timeout;
 			}
-			mm->swap_token_time = eligible;
+			swap_token_mm->swap_token_time = eligible;
 			swap_token_timeout = jiffies + swap_token_default_timeout;
 			swap_token_mm = current->mm;
 		}
#1 lore raw

PATCH 1/1 mm: thrashing control cleanups

Hi,

Here's a version that applies with -p1. Quilt did some silly things to the previous one...

This patch removes one redundant variable from mm/thrash.c and moves declaration of one variable closer to the block where it is actually used.

Signed-off-by Pekka Enberg <[email protected]>

---

 thrash.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
mm/thrash.c +3 -6
Index: 2.6/mm/thrash.c
===================================================================
@@ -51,9 +51,6 @@
  */
 void grab_swap_token(void)
 {
-	struct mm_struct *mm;
-	int reason;
-
 	/* We have the token. Let others know we still need it. */
 	if (has_swap_token(current->mm)) {
 		current->mm->recent_pagein = 1;

@@ -61,6 +58,7 @@
 	}
 
 	if (time_after(jiffies, swap_token_check)) {
+		int reason;
 
 		/* Can't get swapout protection if we exceed our RSS limit. */
 		// if (current->mm->rss > current->mm->rlimit_rss)

@@ -75,13 +73,12 @@
 
 		swap_token_check = jiffies + SWAP_TOKEN_CHECK_INTERVAL;
 
-		mm = swap_token_mm;
-		if ((reason = should_release_swap_token(mm))) {
+		if ((reason = should_release_swap_token(swap_token_mm))) {
 			unsigned long eligible = jiffies;
 			if (reason == SWAP_TOKEN_TIMED_OUT) {
 				eligible += swap_token_default_timeout;
 			}
-			mm->swap_token_time = eligible;
+			swap_token_mm->swap_token_time = eligible;
 			swap_token_timeout = jiffies + swap_token_default_timeout;
 			swap_token_mm = current->mm;
 		}