policy.l_extent.end);
descr->cld_enq_flags = flags;
result = cl_io_lock_alloc_add(env, io, descr);
+
+ CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n",
+ descr->cld_mode, descr->cld_start,
+ descr->cld_end);
+
if (result < 0)
RETURN(result);
if (new_size == 0)
enqflags = CEF_DISCARD_DATA;
} else {
- LASSERT((io->u.ci_setattr.sa_attr.lvb_mtime <
- io->u.ci_setattr.sa_attr.lvb_ctime) ||
- (io->u.ci_setattr.sa_attr.lvb_atime <
- io->u.ci_setattr.sa_attr.lvb_ctime));
+ if ((io->u.ci_setattr.sa_attr.lvb_mtime >=
+ io->u.ci_setattr.sa_attr.lvb_ctime) ||
+ (io->u.ci_setattr.sa_attr.lvb_atime >=
+ io->u.ci_setattr.sa_attr.lvb_ctime))
+ return 0;
new_size = 0;
}
cio->u.setattr.cui_local_lock = SETATTR_EXTENT_LOCK;
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);
/* Sanity check whether the page is protected by a lock. */
rc = cl_page_is_under_lock(env, io, page);
if (rc != -EBUSY) {
- CL_PAGE_HEADER(D_WARNING, env, page, "%s: %i\n",
+ CL_PAGE_HEADER(D_WARNING, env, page, "%s: %d\n",
rc == -ENODATA ? "without a lock" :
"match failed", rc);
if (rc != -ENODATA)
ll_inode_size_lock(inode, 0);
if (result == 0) {
- if (size > i_size_read(inode))
+ if (size > i_size_read(inode)) {
cl_isize_write_nolock(inode, size);
+ CDEBUG(D_VFSTRACE, DFID" updating i_size %lu\n",
+ PFID(lu_object_fid(&obj->co_lu)),
+ (unsigned long)size);
+ }
cl_page_export(env, pg, 1);
} else {
if (size > i_size_read(inode))