io->ci_obj = obj;
io->ci_verify_layout = 1;
- io->u.ci_setattr.sa_attr.lvb_atime = LTIME_S(attr->ia_atime);
- io->u.ci_setattr.sa_attr.lvb_mtime = LTIME_S(attr->ia_mtime);
- io->u.ci_setattr.sa_attr.lvb_ctime = LTIME_S(attr->ia_ctime);
+ io->u.ci_setattr.sa_attr.lvb_atime = attr->ia_atime.tv_sec;
+ io->u.ci_setattr.sa_attr.lvb_mtime = attr->ia_mtime.tv_sec;
+ io->u.ci_setattr.sa_attr.lvb_ctime = attr->ia_ctime.tv_sec;
io->u.ci_setattr.sa_attr.lvb_size = attr->ia_size;
io->u.ci_setattr.sa_attr_flags = attr_flags;
io->u.ci_setattr.sa_avalid = attr->ia_valid;
if (!(inode->i_state & I_NEW)) {
result = -EIO;
CERROR("%s: unexpected not-NEW inode "DFID": rc = %d\n",
- ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid),
- result);
+ ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
goto out;
}
if (result != 0)
CERROR("%s: failed to initialize cl_object "DFID": rc = %d\n",
- ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid), result);
+ ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
out:
cl_env_put(env, &refcheck);
static void cl_object_put_last(struct lu_env *env, struct cl_object *obj)
{
struct lu_object_header *header = obj->co_lu.lo_header;
- wait_queue_entry_t waiter;
if (unlikely(atomic_read(&header->loh_ref) != 1)) {
struct lu_site *site = obj->co_lu.lo_dev->ld_site;
wq = lu_site_wq_from_fid(site, &header->loh_fid);
- init_waitqueue_entry(&waiter, current);
- add_wait_queue(wq, &waiter);
-
- while (1) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- if (atomic_read(&header->loh_ref) == 1)
- break;
- schedule();
- }
-
- set_current_state(TASK_RUNNING);
- remove_wait_queue(wq, &waiter);
+ wait_event(*wq, atomic_read(&header->loh_ref) == 1);
}
cl_object_put(env, obj);