diff --git a/[refs] b/[refs] index 2bc80e4098bf..f04013281dcd 100644 --- 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 index 9692c5215a2c..5c56765c848a 100644 --- 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);