Updated from Linux LTS 3.10.25 to 3.10.26
This commit is contained in:
@@ -203,9 +203,10 @@ get_write_lock:
|
||||
if (mapping_cap_account_dirty(mapping)) {
|
||||
unsigned long addr;
|
||||
struct file *file = get_file(vma->vm_file);
|
||||
/* mmap_region may free vma; grab the info now */
|
||||
vm_flags = vma->vm_flags;
|
||||
|
||||
addr = mmap_region(file, start, size,
|
||||
vma->vm_flags, pgoff);
|
||||
addr = mmap_region(file, start, size, vm_flags, pgoff);
|
||||
fput(file);
|
||||
if (IS_ERR_VALUE(addr)) {
|
||||
err = addr;
|
||||
@@ -213,7 +214,7 @@ get_write_lock:
|
||||
BUG_ON(addr != start);
|
||||
err = 0;
|
||||
}
|
||||
goto out;
|
||||
goto out_freed;
|
||||
}
|
||||
mutex_lock(&mapping->i_mmap_mutex);
|
||||
flush_dcache_mmap_lock(mapping);
|
||||
@@ -248,6 +249,7 @@ get_write_lock:
|
||||
out:
|
||||
if (vma)
|
||||
vm_flags = vma->vm_flags;
|
||||
out_freed:
|
||||
if (likely(!has_write_lock))
|
||||
up_read(&mm->mmap_sem);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user