android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dax: Remove dead zeroing code from fault handlers

Browse Source 
Now that all filesystems zero out blocks allocated for a fault handler,
we can just remove the zeroing from the handler itself. Also add checks
that no filesystem returns to us unwritten or new buffer.

Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
This commit is contained in:
Jan Kara 2016-05-11 11:58:50 +02:00 committed by Vishal Verma
parent 86b0624e42
commit 2b10945c53
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/dax.c
View File

@ -587,11 +587,6 @@ static int dax_insert_mapping(struct inode *inode, struct buffer_head *bh,
error = PTR_ERR(dax.addr); error = PTR_ERR(dax.addr);
goto out; goto out;
} }
if (buffer_unwritten(bh) || buffer_new(bh)) {
clear_pmem(dax.addr, PAGE_SIZE);
wmb_pmem();
}
dax_unmap_atomic(bdev, &dax); dax_unmap_atomic(bdev, &dax);
error = dax_radix_entry(mapping, vmf->pgoff, dax.sector, false, error = dax_radix_entry(mapping, vmf->pgoff, dax.sector, false,
@ -722,7 +717,7 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf,
} }
/* Filesystem should not return unwritten buffers to us! */ /* Filesystem should not return unwritten buffers to us! */
WARN_ON_ONCE(buffer_unwritten(&bh)); WARN_ON_ONCE(buffer_unwritten(&bh) || buffer_new(&bh));
error = dax_insert_mapping(inode, &bh, vma, vmf); error = dax_insert_mapping(inode, &bh, vma, vmf);
out: out:
@ -854,7 +849,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
if (get_block(inode, block, &bh, 1) != 0) if (get_block(inode, block, &bh, 1) != 0)
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
alloc = true; alloc = true;
WARN_ON_ONCE(buffer_unwritten(&bh)); WARN_ON_ONCE(buffer_unwritten(&bh) || buffer_new(&bh));
} }
bdev = bh.b_bdev; bdev = bh.b_bdev;
@ -953,14 +948,6 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address,
dax_pmd_dbg(&bh, address, "pfn not in memmap"); dax_pmd_dbg(&bh, address, "pfn not in memmap");
goto fallback; goto fallback;
} }
if (buffer_unwritten(&bh) || buffer_new(&bh)) {
clear_pmem(dax.addr, PMD_SIZE);
wmb_pmem();
count_vm_event(PGMAJFAULT);
mem_cgroup_count_vm_event(vma->vm_mm, PGMAJFAULT);
result |= VM_FAULT_MAJOR;
}
dax_unmap_atomic(bdev, &dax); dax_unmap_atomic(bdev, &dax);
/* /*