static void
osd_object_sa_dirty_add(struct osd_object *obj, struct osd_thandle *oh)
{
- if (!cfs_list_empty(&obj->oo_sa_linkage))
+ if (!list_empty(&obj->oo_sa_linkage))
return;
down(&oh->ot_sa_lock);
write_lock(&obj->oo_attr_lock);
- if (likely(cfs_list_empty(&obj->oo_sa_linkage)))
- cfs_list_add(&obj->oo_sa_linkage, &oh->ot_sa_list);
+ if (likely(list_empty(&obj->oo_sa_linkage)))
+ list_add(&obj->oo_sa_linkage, &oh->ot_sa_list);
write_unlock(&obj->oo_attr_lock);
up(&oh->ot_sa_lock);
}
struct osd_object *obj;
down(&oh->ot_sa_lock);
- while (!cfs_list_empty(&oh->ot_sa_list)) {
- obj = cfs_list_entry(oh->ot_sa_list.next,
+ while (!list_empty(&oh->ot_sa_list)) {
+ obj = list_entry(oh->ot_sa_list.next,
struct osd_object, oo_sa_linkage);
sa_spill_rele(obj->oo_sa_hdl);
write_lock(&obj->oo_attr_lock);
- cfs_list_del_init(&obj->oo_sa_linkage);
+ list_del_init(&obj->oo_sa_linkage);
write_unlock(&obj->oo_attr_lock);
}
up(&oh->ot_sa_lock);
{
struct osd_object *mo;
- OBD_SLAB_ALLOC_PTR_GFP(mo, osd_object_kmem, __GFP_IO);
+ OBD_SLAB_ALLOC_PTR_GFP(mo, osd_object_kmem, GFP_NOFS);
if (mo != NULL) {
struct lu_object *l;
dt_object_init(&mo->oo_dt, NULL, d);
mo->oo_dt.do_ops = &osd_obj_ops;
l->lo_ops = &osd_lu_obj_ops;
- CFS_INIT_LIST_HEAD(&mo->oo_sa_linkage);
+ INIT_LIST_HEAD(&mo->oo_sa_linkage);
init_rwsem(&mo->oo_sem);
sema_init(&mo->oo_guard, 1);
rwlock_init(&mo->oo_attr_lock);
obj->oo_sa_xattr = NULL;
}
sa_buf_rele(obj->oo_db, osd_obj_tag);
- cfs_list_del(&obj->oo_sa_linkage);
+ list_del(&obj->oo_sa_linkage);
obj->oo_db = NULL;
}
}
struct osd_thandle *oh;
struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
sa_bulk_attr_t *bulk;
+ __u64 valid = la->la_valid;
int cnt;
int rc = 0;
transaction group. */
LASSERT(oh->ot_tx->tx_txg != 0);
- if (la->la_valid == 0)
+ /* Only allow set size for regular file */
+ if (!S_ISREG(dt->do_lu.lo_header->loh_attr))
+ valid &= ~(LA_SIZE | LA_BLOCKS);
+
+ if (valid == 0)
RETURN(0);
OBD_ALLOC(bulk, sizeof(sa_bulk_attr_t) * 10);
RETURN(-ENOMEM);
/* do both accounting updates outside oo_attr_lock below */
- if ((la->la_valid & LA_UID) && (la->la_uid != obj->oo_attr.la_uid)) {
+ if ((valid & LA_UID) && (la->la_uid != obj->oo_attr.la_uid)) {
/* Update user accounting. Failure isn't fatal, but we still
* log an error message */
rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
"%d (%d)\n", osd->od_svname,
obj->oo_attr.la_uid, rc);
}
- if ((la->la_valid & LA_GID) && (la->la_gid != obj->oo_attr.la_gid)) {
+ if ((valid & LA_GID) && (la->la_gid != obj->oo_attr.la_gid)) {
/* Update group accounting. Failure isn't fatal, but we still
* log an error message */
rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
write_lock(&obj->oo_attr_lock);
cnt = 0;
- if (la->la_valid & LA_ATIME) {
+ if (valid & LA_ATIME) {
osa->atime[0] = obj->oo_attr.la_atime = la->la_atime;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(uos), NULL,
osa->atime, 16);
}
- if (la->la_valid & LA_MTIME) {
+ if (valid & LA_MTIME) {
osa->mtime[0] = obj->oo_attr.la_mtime = la->la_mtime;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(uos), NULL,
osa->mtime, 16);
}
- if (la->la_valid & LA_CTIME) {
+ if (valid & LA_CTIME) {
osa->ctime[0] = obj->oo_attr.la_ctime = la->la_ctime;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(uos), NULL,
osa->ctime, 16);
}
- if (la->la_valid & LA_MODE) {
+ if (valid & LA_MODE) {
/* mode is stored along with type, so read it first */
obj->oo_attr.la_mode = (obj->oo_attr.la_mode & S_IFMT) |
(la->la_mode & ~S_IFMT);
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(uos), NULL,
&osa->mode, 8);
}
- if (la->la_valid & LA_SIZE) {
+ if (valid & LA_SIZE) {
osa->size = obj->oo_attr.la_size = la->la_size;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(uos), NULL,
&osa->size, 8);
}
- if (la->la_valid & LA_NLINK) {
+ if (valid & LA_NLINK) {
osa->nlink = obj->oo_attr.la_nlink = la->la_nlink;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(uos), NULL,
&osa->nlink, 8);
}
- if (la->la_valid & LA_RDEV) {
+ if (valid & LA_RDEV) {
osa->rdev = obj->oo_attr.la_rdev = la->la_rdev;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_RDEV(uos), NULL,
&osa->rdev, 8);
}
- if (la->la_valid & LA_FLAGS) {
+ if (valid & LA_FLAGS) {
osa->flags = attrs_fs2zfs(la->la_flags);
/* many flags are not supported by zfs, so ensure a good cached
* copy */
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(uos), NULL,
&osa->flags, 8);
}
- if (la->la_valid & LA_UID) {
+ if (valid & LA_UID) {
osa->uid = obj->oo_attr.la_uid = la->la_uid;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(uos), NULL,
&osa->uid, 8);
}
- if (la->la_valid & LA_GID) {
+ if (valid & LA_GID) {
osa->gid = obj->oo_attr.la_gid = la->la_gid;
SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(uos), NULL,
&osa->gid, 8);
}
- obj->oo_attr.la_valid |= la->la_valid;
+ obj->oo_attr.la_valid |= valid;
write_unlock(&obj->oo_attr_lock);
rc = osd_object_sa_bulk_update(obj, bulk, cnt, oh);
int rc;
LASSERT(tag);
- spin_lock(&uos->lock);
- uos->objects++;
- spin_unlock(&uos->lock);
-
/* Assert that the transaction has been assigned to a
transaction group. */
LASSERT(tx->tx_txg != 0);
oid = dmu_object_alloc(uos->os, DMU_OT_PLAIN_FILE_CONTENTS, 0,
DMU_OT_SA, DN_MAX_BONUSLEN, tx);
rc = -sa_buf_hold(uos->os, oid, tag, dbp);
- if (rc)
- return rc;
+ LASSERTF(rc == 0, "sa_buf_hold "LPU64" failed: %d\n", oid, rc);
LASSERT(la->la_valid & LA_MODE);
la->la_size = 0;
la->la_nlink = 1;
- return __osd_attr_init(env, uos, oid, tx, la, parent);
+ rc = __osd_attr_init(env, uos, oid, tx, la, parent);
+ if (rc != 0) {
+ sa_buf_rele(*dbp, tag);
+ *dbp = NULL;
+ dmu_object_free(uos->os, oid, tx);
+ return rc;
+ }
+
+ spin_lock(&uos->lock);
+ uos->objects++;
+ spin_unlock(&uos->lock);
+ return 0;
}
/*
RETURN(oc);
}
-static int osd_object_sync(const struct lu_env *env, struct dt_object *dt)
+static int osd_object_sync(const struct lu_env *env, struct dt_object *dt,
+ __u64 start, __u64 end)
{
struct osd_device *osd = osd_obj2dev(osd_dt_obj(dt));
ENTRY;
/* XXX: no other option than syncing the whole filesystem until we
- * support ZIL */
+ * support ZIL. If the object tracked the txg that it was last
+ * modified in, it could pass that txg here instead of "0". Maybe
+ * the changes are already committed, so no wait is needed at all? */
txg_wait_synced(dmu_objset_pool(osd->od_objset.os), 0ULL);
RETURN(0);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff