Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 1acfb2687bfa..d221a1cfd7b1 100644
--- a/mm/shmem.c
+++ b/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;