patch-2.3.99-pre4 linux/arch/sparc/mm/sun4c.c

Next file: linux/arch/sparc64/config.in
Previous file: linux/arch/sparc/mm/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre3/linux/arch/sparc/mm/sun4c.c linux/arch/sparc/mm/sun4c.c
@@ -2408,20 +2408,16 @@
  */
 static void sun4c_vac_alias_fixup(struct vm_area_struct *vma, unsigned long address, pte_t pte)
 {
-	struct dentry *dentry = NULL;
-	struct inode *inode = NULL;
 	pgd_t *pgdp;
 	pte_t *ptep;
 
-	if (vma->vm_file)
-		dentry = vma->vm_file->f_dentry;
-	if(dentry)
-		inode = dentry->d_inode;
-	if(inode) {
-		struct address_space *mapping = inode->i_mapping;
+	if (vma->vm_file) {
+		struct address_space *mapping;
 		unsigned long offset = (address & PAGE_MASK) - vma->vm_start;
 		struct vm_area_struct *vmaring;
 		int alias_found = 0;
+
+		mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
 		spin_lock(&mapping->i_shared_lock);
 		vmaring = mapping->i_mmap; 
 		do {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)