From: Balbir Singh <balbir@linux.vnet.ibm.com>
Date: Thu, 15 Nov 2007 01:00:33 +0000 (-0800)
Subject: Swap delay accounting, include lock_page() delays
X-Git-Tag: v2.6.24-rc3~55
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20a1022d4ac5c53f0956006fd9e30cf4846d5e58;p=linux-2.6

Swap delay accounting, include lock_page() delays

The delay incurred in lock_page() should also be accounted in swap delay
accounting

Reported-by: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/memory.c b/mm/memory.c
index 7b0403bfc9..4bf0b6d0eb 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2084,9 +2084,9 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		count_vm_event(PGMAJFAULT);
 	}
 
-	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 	mark_page_accessed(page);
 	lock_page(page);
+	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 
 	/*
 	 * Back out if somebody else already faulted in this pte.