return -ENOMEM;
}
+ if (unlikely(cfio->fault.ft_flags & VM_FAULT_RETRY))
+ return -EAGAIN;
+
CERROR("unknow error in page fault!\n");
return -EINVAL;
}
if (result != 0)
return result;
- /* must return locked page */
+ /* must return unlocked page */
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);
+ /* Though we have already held a cl_lock upon this page, but
+ * it still can be truncated locally. */
+ page = ERR_PTR(-EFAULT);
+ if (likely(cfio->ft_vmpage->mapping != NULL))
+ 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);
static int vvp_page_sync_io(const struct lu_env *env, struct cl_io *io,
struct cl_page *page, struct ccc_page *cp,
- int to, enum cl_req_type crt)
+ enum cl_req_type crt)
{
struct cl_2queue *queue;
int result;
LASSERT(io->ci_type == CIT_READ || io->ci_type == CIT_WRITE);
queue = &io->ci_queue;
-
cl_2queue_init_page(queue, page);
- cl_page_clip(env, page, 0, to);
result = cl_io_submit_sync(env, io, crt, queue, CRP_NORMAL, 0);
LASSERT(cl_page_is_owned(page, io));
- cl_page_clip(env, page, 0, CFS_PAGE_SIZE);
if (crt == CRT_READ)
/*
} else if (cp->cpg_defer_uptodate)
cp->cpg_ra_used = 1;
else
- result = vvp_page_sync_io(env, io, pg, cp,
- CFS_PAGE_SIZE, CRT_READ);
+ result = vvp_page_sync_io(env, io, pg, cp, CRT_READ);
/*
* In older implementations, obdo_refresh_inode is called here
* to update the inode because the write might modify the
* it will not soon. */
vvp_write_pending(cl2ccc(obj), cp);
result = cl_page_cache_add(env, io, pg, CRT_WRITE);
- if (result == -EDQUOT)
+ if (result == -EDQUOT) {
+ pgoff_t last_index = i_size_read(inode) >> CFS_PAGE_SHIFT;
+ bool need_clip = true;
+
/*
* Client ran out of disk space grant. Possible
* strategies are:
* what the new code continues to do for the time
* being.
*/
- result = vvp_page_sync_io(env, io, pg, cp,
- to, CRT_WRITE);
+ if (last_index > pg->cp_index) {
+ to = CFS_PAGE_SIZE;
+ need_clip = false;
+ } else if (last_index == pg->cp_index) {
+ int size_to = i_size_read(inode) & ~CFS_PAGE_MASK;
+ if (to < size_to)
+ to = size_to;
+ }
+ if (need_clip)
+ cl_page_clip(env, pg, 0, to);
+ result = vvp_page_sync_io(env, io, pg, cp, CRT_WRITE);
if (result)
CERROR("Write page %lu of inode %p failed %d\n",
pg->cp_index, inode, result);
+ }
} else {
tallyop = LPROC_LL_DIRTY_HITS;
result = 0;
cl_page_discard(env, io, pg);
}
ll_inode_size_unlock(inode, 0);
-
RETURN(result);
}
vio->cui_ra_window_set = 0;
result = 0;
if (io->ci_type == CIT_READ || io->ci_type == CIT_WRITE) {
- int op;
size_t count;
count = io->u.ci_rw.crw_count;
- op = io->ci_type == CIT_READ ?
- LPROC_LL_READ_BYTES : LPROC_LL_WRITE_BYTES;
/* "If nbyte is 0, read() will return 0 and have no other
* results." -- Single Unix Spec */
if (count == 0)
else {
cio->cui_tot_count = count;
cio->cui_tot_nrsegs = 0;
- ll_stats_ops_tally(sbi, op, count);
}
} else if (io->ci_type == CIT_SETATTR) {
if (cl_io_is_trunc(io))