From 6b4234a24b1ffcd1cb54d816a43663d1de346f4a Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Fri, 20 May 2011 15:47:33 -0700
Subject: [PATCH] --- yaml --- r: 247761 b: refs/heads/master c:
 e6c9366b2adb52cba64b359b3050200743c7568c h: refs/heads/master i:   247759:
 c33f644c3d476b346a79d00e77c35eb6901e0308 v: v3

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

diff --git a/[refs] b/[refs]
index 24a476737bb5..679bb932e42b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de06f313a65d0ecabf055e708d082002b568866
+refs/heads/master: e6c9366b2adb52cba64b359b3050200743c7568c
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index dfc7069102ee..ba4ad28b7db6 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -916,11 +916,12 @@ static int shmem_unuse_inode(struct shmem_inode_info *info, swp_entry_t entry, s
 			if (size > ENTRIES_PER_PAGE)
 				size = ENTRIES_PER_PAGE;
 			offset = shmem_find_swp(entry, ptr, ptr+size);
+			shmem_swp_unmap(ptr);
 			if (offset >= 0) {
 				shmem_dir_unmap(dir);
+				ptr = shmem_swp_map(subdir);
 				goto found;
 			}
-			shmem_swp_unmap(ptr);
 		}
 	}
 lost1: