---

yaml --- r: 308901 b: refs/heads/master c: 92ba39a h: refs/heads/master i: 308899: c0f2614 v: v3
git-mirror · May 29, 2012 · c308a2d · c308a2d
1 parent d333506
commit c308a2d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bbda35ce1e854eae147d1365ac827eb6e229063
+refs/heads/master: 92ba39a7acafb4f979fddcd22545603a11c349bb
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -5150,7 +5150,6 @@ static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
 			unsigned long addr, pte_t ptent, swp_entry_t *entry)
 {
 	struct page *page = NULL;
-	struct inode *inode;
 	struct address_space *mapping;
 	pgoff_t pgoff;
 
@@ -5159,7 +5158,6 @@ static struct page *mc_handle_file_pte(struct vm_area_struct *vma,
 	if (!move_file())
 		return NULL;
 
-	inode = vma->vm_file->f_path.dentry->d_inode;
 	mapping = vma->vm_file->f_mapping;
 	if (pte_none(ptent))
 		pgoff = linear_page_index(vma, addr);