* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
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;
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);
/* 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)
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);
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))