patch-2.3.51 linux/mm/mmap.c

• Lines: 26
• Date: Wed Mar 8 09:16:24 2000
• Orig file: v2.3.50/linux/mm/mmap.c
• Orig date: Thu Mar 2 14:36:23 2000

diff -u --recursive --new-file v2.3.50/linux/mm/mmap.c linux/mm/mmap.c
@@ -305,14 +305,14 @@
 			atomic_dec(&file->f_dentry->d_inode->i_writecount);
 			correct_wcount = 1;
 		}
+		vma->vm_file = file;
+		get_file(file);
 		error = file->f_op->mmap(file, vma);
 		/* Fix up the count if necessary, then check for an error */
 		if (correct_wcount)
 			atomic_inc(&file->f_dentry->d_inode->i_writecount);
 		if (error)
 			goto unmap_and_free_vma;
-		vma->vm_file = file;
-		get_file(file);
 	}
 
 	/*
@@ -334,6 +334,8 @@
 	return addr;
 
 unmap_and_free_vma:
+	vma->vm_file = NULL;
+	fput(file);
 	/* Undo any partial mapping done by a device driver. */
 	flush_cache_range(mm, vma->vm_start, vma->vm_end);
 	zap_page_range(mm, vma->vm_start, vma->vm_end - vma->vm_start);