From c72970212ecfaeafc6a1f3c824dea4f471a53a92 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Sat, 28 May 2011 13:14:09 -0700
Subject: [PATCH] --- yaml --- r: 252735 b: refs/heads/master c:
 826267cf1e6c6899eda1325a19f1b1d15c558b20 h: refs/heads/master i:   252733:
 dcde8d4b233e80329fde743f0f05b97525bcda6b   252731:
 f25320bb87e5e1cd994a3217ceb5632c77e0d09e   252727:
 552087410d55cebdcc9227a9aedcdf07887497e5   252719:
 1f1ec06e9ef8448cf9f0e92fe274313ad8f3ff7c   252703:
 e73eab9a2fc183768335b59c459845a318b20fcd   252671:
 313509f13bc801da6527a4236237b079a90fe4a5 v: v3

---
 [refs]           | 2 +-
 trunk/mm/shmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97c87658e739..e47a9638718e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36947a76826111e661a26cb0f668a5be6cc3ddb4
+refs/heads/master: 826267cf1e6c6899eda1325a19f1b1d15c558b20
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 1acfb2687bfa..d221a1cfd7b1 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -1114,8 +1114,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
 		delete_from_page_cache(page);
 		shmem_swp_set(info, entry, swap.val);
 		shmem_swp_unmap(entry);
-		spin_unlock(&info->lock);
 		swap_shmem_alloc(swap);
+		spin_unlock(&info->lock);
 		BUG_ON(page_mapped(page));
 		swap_writepage(page, wbc);
 		return 0;