---

yaml --- r: 247761 b: refs/heads/master c: e6c9366 h: refs/heads/master i: 247759: c33f644 v: v3
git-mirror · May 20, 2011 · 6b4234a · 6b4234a
1 parent 11e5100
commit 6b4234a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: