LL_CDEBUG_PAGE(D_PAGE, vmpage, "got addr %lu type %lx\n",
cfio->nopage.ft_address, (long)cfio->nopage.ft_type);
+ lock_page(vmpage);
+ if (vmpage->mapping == NULL) {
+ CERROR("vmpage %lu@%p was truncated!\n", vmpage->index, vmpage);
+ unlock_page(vmpage);
+ page_cache_release(vmpage);
+ return -EFAULT;
+ }
+
cfio->ft_vmpage = vmpage;
return 0;
LL_CDEBUG_PAGE(D_PAGE, cfio->fault.ft_vmf->page,
"got addr %p type NOPAGE\n",
cfio->fault.ft_vmf->virtual_address);
- /*XXX workaround to bug in CLIO - he deadlocked with
- lock cancel if page locked */
- if (likely(cfio->fault.ft_flags & VM_FAULT_LOCKED)) {
- unlock_page(cfio->fault.ft_vmf->page);
- cfio->fault.ft_flags &= ~VM_FAULT_LOCKED;
- }
+ LASSERT(cfio->fault.ft_flags & VM_FAULT_LOCKED);
cfio->ft_vmpage = cfio->fault.ft_vmf->page;
return 0;
kernel_result = vvp_io_kernel_fault(cfio);
if (kernel_result != 0)
return kernel_result;
- /* Temporarily lock vmpage to keep cl_page_find() happy. */
- lock_page(cfio->ft_vmpage);
+
page = cl_page_find(env, obj, fio->ft_index, cfio->ft_vmpage,
CPT_CACHEABLE);
- unlock_page(cfio->ft_vmpage);
- if (IS_ERR(page)) {
- page_cache_release(cfio->ft_vmpage);
- cfio->ft_vmpage = NULL;
+ if (IS_ERR(page))
return PTR_ERR(page);
- }
size = i_size_read(inode);
last = cl_index(obj, size - 1);