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;