* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
down(&oh->ot_sa_lock);
while (!list_empty(&oh->ot_sa_list)) {
obj = list_entry(oh->ot_sa_list.next,
- struct osd_object, oo_sa_linkage);
+ struct osd_object, oo_sa_linkage);
sa_spill_rele(obj->oo_sa_hdl);
write_lock(&obj->oo_attr_lock);
list_del_init(&obj->oo_sa_linkage);
la->la_flags = attrs_zfs2fs(osa->flags);
la->la_size = osa->size;
+ /* Try to get extra flag from LMA. Right now, only LMAI_ORPHAN
+ * flags is stored in LMA, and it is only for orphan directory */
+ if (S_ISDIR(la->la_mode) && dt_object_exists(&obj->oo_dt)) {
+ struct osd_thread_info *info = osd_oti_get(env);
+ struct lustre_mdt_attrs *lma;
+ struct lu_buf buf;
+
+ lma = (struct lustre_mdt_attrs *)info->oti_buf;
+ buf.lb_buf = lma;
+ buf.lb_len = sizeof(info->oti_buf);
+ rc = osd_xattr_get(env, &obj->oo_dt, &buf, XATTR_NAME_LMA);
+ if (rc > 0) {
+ rc = 0;
+ lma->lma_incompat = le32_to_cpu(lma->lma_incompat);
+ obj->oo_lma_flags =
+ lma_to_lustre_flags(lma->lma_incompat);
+
+ } else if (rc == -ENODATA) {
+ rc = 0;
+ }
+ }
+
if (S_ISCHR(la->la_mode) || S_ISBLK(la->la_mode)) {
rc = -sa_lookup(sa_hdl, SA_ZPL_RDEV(o), &osa->rdev, 8);
if (rc)
mo->oo_dt.do_ops = &osd_obj_ops;
l->lo_ops = &osd_lu_obj_ops;
INIT_LIST_HEAD(&mo->oo_sa_linkage);
+ INIT_LIST_HEAD(&mo->oo_unlinked_linkage);
init_rwsem(&mo->oo_sem);
- sema_init(&mo->oo_guard, 1);
+ init_rwsem(&mo->oo_guard);
rwlock_init(&mo->oo_attr_lock);
+ mo->oo_destroy = OSD_DESTROY_NONE;
return l;
} else {
return NULL;
int osd_object_init0(const struct lu_env *env, struct osd_object *obj)
{
struct osd_device *osd = osd_obj2dev(obj);
- const struct lu_fid *fid = lu_object_fid(&obj->oo_dt.do_lu);
+ const struct lu_fid *fid = lu_object_fid(&obj->oo_dt.do_lu);
int rc = 0;
ENTRY;
RETURN(0);
}
+ if (conf != NULL && conf->loc_flags & LOC_F_NEW)
+ GOTO(out, rc = 0);
+
rc = osd_fid_lookup(env, osd, lu_object_fid(l), &oid);
if (rc == 0) {
LASSERT(obj->oo_db == NULL);
rc = __osd_obj2dbuf(env, osd->od_os, oid, &obj->oo_db);
+ /* EEXIST will be returned if object is being deleted in ZFS */
+ if (rc == -EEXIST) {
+ rc = 0;
+ GOTO(out, rc);
+ }
if (rc != 0) {
CERROR("%s: lookup "DFID"/"LPX64" failed: rc = %d\n",
osd->od_svname, PFID(lu_object_fid(l)), oid, rc);
OBD_SLAB_FREE_PTR(obj, osd_object_kmem);
}
-static void __osd_declare_object_destroy(const struct lu_env *env,
- struct osd_object *obj,
- struct osd_thandle *oh)
+static int
+osd_object_unlinked_add(struct osd_object *obj, struct osd_thandle *oh)
{
- struct osd_device *osd = osd_obj2dev(obj);
- dmu_buf_t *db = obj->oo_db;
- zap_attribute_t *za = &osd_oti_get(env)->oti_za;
- uint64_t oid = db->db_object, xid;
- dmu_tx_t *tx = oh->ot_tx;
- zap_cursor_t *zc;
- int rc = 0;
+ int rc = -EBUSY;
- dmu_tx_hold_free(tx, oid, 0, DMU_OBJECT_END);
+ LASSERT(obj->oo_destroy == OSD_DESTROY_ASYNC);
- /* zap holding xattrs */
- if (obj->oo_xattr != ZFS_NO_OBJECT) {
- oid = obj->oo_xattr;
-
- dmu_tx_hold_free(tx, oid, 0, DMU_OBJECT_END);
-
- rc = osd_zap_cursor_init(&zc, osd->od_os, oid, 0);
- if (rc)
- goto out;
+ /* the object is supposed to be exclusively locked by
+ * the caller (osd_object_destroy()), while the transaction
+ * (oh) is per-thread and not shared */
+ if (likely(list_empty(&obj->oo_unlinked_linkage))) {
+ list_add(&obj->oo_unlinked_linkage, &oh->ot_unlinked_list);
+ rc = 0;
+ }
- while ((rc = -zap_cursor_retrieve(zc, za)) == 0) {
- BUG_ON(za->za_integer_length != sizeof(uint64_t));
- BUG_ON(za->za_num_integers != 1);
+ return rc;
+}
- rc = -zap_lookup(osd->od_os, obj->oo_xattr, za->za_name,
- sizeof(uint64_t), 1, &xid);
- if (rc) {
- CERROR("%s: xattr lookup failed: rc = %d\n",
- osd->od_svname, rc);
- goto out_err;
- }
- dmu_tx_hold_free(tx, xid, 0, DMU_OBJECT_END);
+/* Default to max data size covered by a level-1 indirect block */
+static unsigned long osd_sync_destroy_max_size =
+ 1UL << (DN_MAX_INDBLKSHIFT - SPA_BLKPTRSHIFT + SPA_MAXBLOCKSHIFT);
+module_param(osd_sync_destroy_max_size, ulong, 0444);
+MODULE_PARM_DESC(osd_sync_destroy_max_size, "Maximum object size to use synchronous destroy.");
- zap_cursor_advance(zc);
- }
- if (rc == -ENOENT)
- rc = 0;
-out_err:
- osd_zap_cursor_fini(zc);
+static inline void
+osd_object_set_destroy_type(struct osd_object *obj)
+{
+ /*
+ * Lock-less OST_WRITE can race with OST_DESTROY, so set destroy type
+ * only once and use it consistently thereafter.
+ */
+ down_write(&obj->oo_guard);
+ if (obj->oo_destroy == OSD_DESTROY_NONE) {
+ if (obj->oo_attr.la_size <= osd_sync_destroy_max_size)
+ obj->oo_destroy = OSD_DESTROY_SYNC;
+ else /* Larger objects are destroyed asynchronously */
+ obj->oo_destroy = OSD_DESTROY_ASYNC;
}
-out:
- if (rc && tx->tx_err == 0)
- tx->tx_err = -rc;
+ up_write(&obj->oo_guard);
}
static int osd_declare_object_destroy(const struct lu_env *env,
struct osd_object *obj = osd_dt_obj(dt);
struct osd_device *osd = osd_obj2dev(obj);
struct osd_thandle *oh;
- uint64_t zapid;
int rc;
+ uint64_t zapid;
ENTRY;
LASSERT(th != NULL);
oh = container_of0(th, struct osd_thandle, ot_super);
LASSERT(oh->ot_tx != NULL);
- /* declare that we'll destroy the object */
- __osd_declare_object_destroy(env, obj, oh);
-
/* declare that we'll remove object from fid-dnode mapping */
zapid = osd_get_name_n_idx(env, osd, fid, buf);
dmu_tx_hold_bonus(oh->ot_tx, zapid);
- dmu_tx_hold_zap(oh->ot_tx, zapid, 0, buf);
+ dmu_tx_hold_zap(oh->ot_tx, zapid, FALSE, buf);
+
+ osd_declare_xattrs_destroy(env, obj, oh);
/* declare that we'll remove object from inode accounting ZAPs */
dmu_tx_hold_bonus(oh->ot_tx, osd->od_iusr_oid);
- dmu_tx_hold_zap(oh->ot_tx, osd->od_iusr_oid, 0, buf);
+ dmu_tx_hold_zap(oh->ot_tx, osd->od_iusr_oid, FALSE, buf);
dmu_tx_hold_bonus(oh->ot_tx, osd->od_igrp_oid);
- dmu_tx_hold_zap(oh->ot_tx, osd->od_igrp_oid, 0, buf);
+ dmu_tx_hold_zap(oh->ot_tx, osd->od_igrp_oid, FALSE, buf);
/* one less inode */
rc = osd_declare_quota(env, osd, obj->oo_attr.la_uid,
/* data to be truncated */
rc = osd_declare_quota(env, osd, obj->oo_attr.la_uid,
obj->oo_attr.la_gid, 0, oh, true, NULL, false);
- RETURN(rc);
-}
-
-/*
- * Delete a DMU object
- *
- * The transaction passed to this routine must have
- * dmu_tx_hold_free(tx, oid, 0, DMU_OBJECT_END) called
- * and then assigned to a transaction group.
- *
- * This will release db and set it to NULL to prevent further dbuf releases.
- */
-static int __osd_object_destroy(const struct lu_env *env,
- struct osd_object *obj,
- dmu_tx_t *tx, void *tag)
-{
- struct osd_device *osd = osd_obj2dev(obj);
- uint64_t xid;
- zap_attribute_t *za = &osd_oti_get(env)->oti_za;
- zap_cursor_t *zc;
- int rc;
-
- /* Assert that the transaction has been assigned to a
- transaction group. */
- LASSERT(tx->tx_txg != 0);
-
- /* zap holding xattrs */
- if (obj->oo_xattr != ZFS_NO_OBJECT) {
- rc = osd_zap_cursor_init(&zc, osd->od_os, obj->oo_xattr, 0);
- if (rc)
- return rc;
- while ((rc = -zap_cursor_retrieve(zc, za)) == 0) {
- BUG_ON(za->za_integer_length != sizeof(uint64_t));
- BUG_ON(za->za_num_integers != 1);
-
- rc = -zap_lookup(osd->od_os, obj->oo_xattr, za->za_name,
- sizeof(uint64_t), 1, &xid);
- if (rc) {
- CERROR("%s: lookup xattr %s failed: rc = %d\n",
- osd->od_svname, za->za_name, rc);
- continue;
- }
- rc = -dmu_object_free(osd->od_os, xid, tx);
- if (rc)
- CERROR("%s: fetch xattr %s failed: rc = %d\n",
- osd->od_svname, za->za_name, rc);
- zap_cursor_advance(zc);
- }
- osd_zap_cursor_fini(zc);
+ if (rc)
+ RETURN(rc);
- rc = -dmu_object_free(osd->od_os, obj->oo_xattr, tx);
- if (rc)
- CERROR("%s: freeing xattr failed: rc = %d\n",
- osd->od_svname, rc);
- }
+ osd_object_set_destroy_type(obj);
+ if (obj->oo_destroy == OSD_DESTROY_SYNC)
+ dmu_tx_hold_free(oh->ot_tx, obj->oo_db->db_object,
+ 0, DMU_OBJECT_END);
+ else
+ dmu_tx_hold_zap(oh->ot_tx, osd->od_unlinkedid, TRUE, NULL);
- return -dmu_object_free(osd->od_os, obj->oo_db->db_object, tx);
+ RETURN(0);
}
static int osd_object_destroy(const struct lu_env *env,
- struct dt_object *dt,
- struct thandle *th)
+ struct dt_object *dt, struct thandle *th)
{
char *buf = osd_oti_get(env)->oti_str;
struct osd_object *obj = osd_dt_obj(dt);
const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
struct osd_thandle *oh;
int rc;
- uint64_t zapid;
+ uint64_t oid, zapid;
ENTRY;
+ down_write(&obj->oo_guard);
+
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = -ENOENT);
+
LASSERT(obj->oo_db != NULL);
- LASSERT(dt_object_exists(dt));
- LASSERT(!lu_object_is_dying(dt->do_lu.lo_header));
oh = container_of0(th, struct osd_thandle, ot_super);
LASSERT(oh != NULL);
LASSERT(oh->ot_tx != NULL);
- zapid = osd_get_name_n_idx(env, osd, fid, buf);
-
/* remove obj ref from index dir (it depends) */
+ zapid = osd_get_name_n_idx(env, osd, fid, buf);
rc = -zap_remove(osd->od_os, zapid, buf, oh->ot_tx);
if (rc) {
- CERROR("%s: zap_remove() failed: rc = %d\n",
- osd->od_svname, rc);
+ CERROR("%s: zap_remove(%s) failed: rc = %d\n",
+ osd->od_svname, buf, rc);
+ GOTO(out, rc);
+ }
+
+ rc = osd_xattrs_destroy(env, obj, oh);
+ if (rc) {
+ CERROR("%s: cannot destroy xattrs for %s: rc = %d\n",
+ osd->od_svname, buf, rc);
GOTO(out, rc);
}
* operation if something goes wrong while updating accounting, but we
* still log an error message to notify the administrator */
rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
- obj->oo_attr.la_uid, -1, oh->ot_tx);
+ obj->oo_attr.la_uid, -1, oh->ot_tx);
if (rc)
CERROR("%s: failed to remove "DFID" from accounting ZAP for usr"
- " %d: rc = %d\n", osd->od_svname, PFID(fid),
- obj->oo_attr.la_uid, rc);
+ " %d: rc = %d\n", osd->od_svname, PFID(fid),
+ obj->oo_attr.la_uid, rc);
rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
obj->oo_attr.la_gid, -1, oh->ot_tx);
if (rc)
CERROR("%s: failed to remove "DFID" from accounting ZAP for grp"
- " %d: rc = %d\n", osd->od_svname, PFID(fid),
- obj->oo_attr.la_gid, rc);
+ " %d: rc = %d\n", osd->od_svname, PFID(fid),
+ obj->oo_attr.la_gid, rc);
+
+ oid = obj->oo_db->db_object;
+ if (unlikely(obj->oo_destroy == OSD_DESTROY_NONE)) {
+ /* this may happen if the destroy wasn't declared
+ * e.g. when the object is created and then destroyed
+ * in the same transaction - we don't need additional
+ * space for destroy specifically */
+ LASSERT(obj->oo_attr.la_size <= osd_sync_destroy_max_size);
+ rc = -dmu_object_free(osd->od_os, oid, oh->ot_tx);
+ if (rc)
+ CERROR("%s: failed to free %s "LPU64": rc = %d\n",
+ osd->od_svname, buf, oid, rc);
+ } else if (obj->oo_destroy == OSD_DESTROY_SYNC) {
+ rc = -dmu_object_free(osd->od_os, oid, oh->ot_tx);
+ if (rc)
+ CERROR("%s: failed to free %s "LPU64": rc = %d\n",
+ osd->od_svname, buf, oid, rc);
+ } else { /* asynchronous destroy */
+ rc = osd_object_unlinked_add(obj, oh);
+ if (rc)
+ GOTO(out, rc);
- /* kill object */
- rc = __osd_object_destroy(env, obj, oh->ot_tx, osd_obj_tag);
- if (rc) {
- CERROR("%s: __osd_object_destroy() failed: rc = %d\n",
- osd->od_svname, rc);
- GOTO(out, rc);
+ rc = -zap_add_int(osd->od_os, osd->od_unlinkedid,
+ oid, oh->ot_tx);
+ if (rc)
+ CERROR("%s: zap_add_int() failed %s "LPU64": rc = %d\n",
+ osd->od_svname, buf, oid, rc);
}
out:
/* not needed in the cache anymore */
set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
-
+ if (rc == 0)
+ obj->oo_destroyed = 1;
+ up_write(&obj->oo_guard);
RETURN (0);
}
LASSERT(osd_invariant(obj));
- down_read(&obj->oo_sem);
+ down_read_nested(&obj->oo_sem, role);
}
static void osd_object_write_lock(const struct lu_env *env,
LASSERT(osd_invariant(obj));
- down_write(&obj->oo_sem);
+ down_write_nested(&obj->oo_sem, role);
}
static void osd_object_read_unlock(const struct lu_env *env,
struct osd_object *obj = osd_dt_obj(dt);
uint64_t blocks;
uint32_t blksize;
+ int rc = 0;
+
+ down_read(&obj->oo_guard);
+
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = -ENOENT);
- LASSERT(dt_object_exists(dt));
LASSERT(osd_invariant(obj));
LASSERT(obj->oo_db);
read_lock(&obj->oo_attr_lock);
*attr = obj->oo_attr;
+ if (obj->oo_lma_flags & LUSTRE_ORPHAN_FL)
+ attr->la_flags |= LUSTRE_ORPHAN_FL;
read_unlock(&obj->oo_attr_lock);
/* with ZFS_DEBUG zrl_add_debug() called by DB_DNODE_ENTER()
attr->la_size = 512 * blocks;
/* Block size may be not set; suggest maximal I/O transfers. */
if (blksize == 0)
- blksize = 1ULL << SPA_MAXBLOCKSHIFT;
+ blksize = osd_spa_maxblocksize(
+ dmu_objset_spa(osd_obj2dev(obj)->od_os));
attr->la_blksize = blksize;
attr->la_blocks = blocks;
attr->la_valid |= LA_BLOCKS | LA_BLKSIZE;
- return 0;
+out:
+ up_read(&obj->oo_guard);
+ return rc;
}
/* Simple wrapper on top of qsd API which implement quota transfer for osd
if (unlikely(qsd == NULL))
return 0;
- LASSERT(qtype >= 0 && qtype < MAXQUOTAS);
+ LASSERT(qtype >= 0 && qtype < LL_MAXQUOTAS);
qi->lqi_type = qtype;
/* inode accounting */
struct osd_thandle *oh;
uint64_t bspace;
uint32_t blksize;
- int rc;
+ int rc = 0;
ENTRY;
- if (!dt_object_exists(dt)) {
- /* XXX: sanity check that object creation is declared */
- RETURN(0);
- }
LASSERT(handle != NULL);
LASSERT(osd_invariant(obj));
oh = container_of0(handle, struct osd_thandle, ot_super);
+ down_read(&obj->oo_guard);
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = 0);
+
LASSERT(obj->oo_sa_hdl != NULL);
LASSERT(oh->ot_tx != NULL);
dmu_tx_hold_sa(oh->ot_tx, obj->oo_sa_hdl, 0);
if (oh->ot_tx->tx_err != 0)
- RETURN(-oh->ot_tx->tx_err);
+ GOTO(out, rc = -oh->ot_tx->tx_err);
sa_object_size(obj->oo_sa_hdl, &blksize, &bspace);
bspace = toqb(bspace * blksize);
+ __osd_xattr_declare_set(env, obj, sizeof(struct lustre_mdt_attrs),
+ XATTR_NAME_LMA, oh);
+
if (attr && attr->la_valid & LA_UID) {
/* account for user inode tracking ZAP update */
dmu_tx_hold_bonus(oh->ot_tx, osd->od_iusr_oid);
obj->oo_attr.la_uid, attr->la_uid,
bspace, &info->oti_qi);
if (rc)
- RETURN(rc);
+ GOTO(out, rc);
}
}
if (attr && attr->la_valid & LA_GID) {
obj->oo_attr.la_gid, attr->la_gid,
bspace, &info->oti_qi);
if (rc)
- RETURN(rc);
+ GOTO(out, rc);
}
}
- RETURN(0);
+out:
+ up_read(&obj->oo_guard);
+ RETURN(rc);
}
/*
static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
const struct lu_attr *la, struct thandle *handle)
{
+ struct osd_thread_info *info = osd_oti_get(env);
struct osd_object *obj = osd_dt_obj(dt);
struct osd_device *osd = osd_obj2dev(obj);
struct osd_thandle *oh;
- struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
+ struct osa_attr *osa = &info->oti_osa;
sa_bulk_attr_t *bulk;
__u64 valid = la->la_valid;
int cnt;
int rc = 0;
ENTRY;
+
+ down_read(&obj->oo_guard);
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = -ENOENT);
+
LASSERT(handle != NULL);
- LASSERT(dt_object_exists(dt));
LASSERT(osd_invariant(obj));
LASSERT(obj->oo_sa_hdl);
if (!S_ISREG(dt->do_lu.lo_header->loh_attr))
valid &= ~(LA_SIZE | LA_BLOCKS);
+ if (valid & LA_CTIME && la->la_ctime == obj->oo_attr.la_ctime)
+ valid &= ~LA_CTIME;
+
+ if (valid & LA_MTIME && la->la_mtime == obj->oo_attr.la_mtime)
+ valid &= ~LA_MTIME;
+
+ if (valid & LA_ATIME && la->la_atime == obj->oo_attr.la_atime)
+ valid &= ~LA_ATIME;
+
if (valid == 0)
- RETURN(0);
+ GOTO(out, rc = 0);
+
+ if (valid & LA_FLAGS) {
+ struct lustre_mdt_attrs *lma;
+ struct lu_buf buf;
+
+ if (la->la_flags & LUSTRE_LMA_FL_MASKS) {
+ CLASSERT(sizeof(info->oti_buf) >= sizeof(*lma));
+ lma = (struct lustre_mdt_attrs *)&info->oti_buf;
+ buf.lb_buf = lma;
+ buf.lb_len = sizeof(info->oti_buf);
+ rc = osd_xattr_get(env, &obj->oo_dt, &buf,
+ XATTR_NAME_LMA);
+ if (rc > 0) {
+ lma->lma_incompat =
+ le32_to_cpu(lma->lma_incompat);
+ lma->lma_incompat |=
+ lustre_to_lma_flags(la->la_flags);
+ lma->lma_incompat =
+ cpu_to_le32(lma->lma_incompat);
+ buf.lb_buf = lma;
+ buf.lb_len = sizeof(*lma);
+ rc = osd_xattr_set_internal(env, obj, &buf,
+ XATTR_NAME_LMA,
+ LU_XATTR_REPLACE,
+ oh);
+ }
+ if (rc < 0) {
+ CWARN("%s: failed to set LMA flags: rc = %d\n",
+ osd->od_svname, rc);
+ RETURN(rc);
+ }
+ }
+ }
OBD_ALLOC(bulk, sizeof(sa_bulk_attr_t) * 10);
if (bulk == NULL)
- RETURN(-ENOMEM);
+ GOTO(out, rc = -ENOMEM);
/* do both accounting updates outside oo_attr_lock below */
if ((valid & LA_UID) && (la->la_uid != obj->oo_attr.la_uid)) {
rc = osd_object_sa_bulk_update(obj, bulk, cnt, oh);
OBD_FREE(bulk, sizeof(sa_bulk_attr_t) * 10);
+out:
+ up_read(&obj->oo_guard);
RETURN(rc);
}
fid_seq_is_local_file(fid_seq(fid))))
type = DMU_OTN_UINT8_METADATA;
- /* Create a new DMU object. */
- oid = dmu_object_alloc(osd->od_os, type, 0,
- DMU_OT_SA, DN_MAX_BONUSLEN, tx);
+ /* Create a new DMU object using the default dnode size. */
+ oid = osd_dmu_object_alloc(osd->od_os, type, 0, 0, tx);
rc = -sa_buf_hold(osd->od_os, oid, osd_obj_tag, dbp);
LASSERTF(rc == 0, "sa_buf_hold "LPU64" failed: %d\n", oid, rc);
transaction group. */
LASSERT(tx->tx_txg != 0);
- oid = zap_create_flags(osd->od_os, 0, flags | ZAP_FLAG_HASH64,
- DMU_OT_DIRECTORY_CONTENTS,
- 14, /* == ZFS fzap_default_block_shift */
- DN_MAX_INDBLKSHIFT, /* indirect block shift */
- DMU_OT_SA, DN_MAX_BONUSLEN, tx);
+ oid = osd_zap_create_flags(osd->od_os, 0, flags | ZAP_FLAG_HASH64,
+ DMU_OT_DIRECTORY_CONTENTS,
+ 14, /* == ZFS fzap_default_blockshift */
+ DN_MAX_INDBLKSHIFT, /* indirect blockshift */
+ 0, tx);
rc = -sa_buf_hold(osd->od_os, oid, osd_obj_tag, zap_dbp);
if (rc)
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
- dmu_buf_t *db;
- int rc;
+ const struct lu_fid *fid = lu_object_fid(&obj->oo_dt.do_lu);
+ dmu_buf_t *db;
+ int rc;
struct osd_device *osd = osd_obj2dev(obj);
LASSERT(S_ISREG(la->la_mode));
return ERR_PTR(rc);
/*
- * XXX: a hack, OST to use bigger blocksize. we need
- * a method in OSD API to control this from OFD/MDD
+ * XXX: This heuristic is non-optimal. It would be better to
+ * increase the blocksize up to osd->od_max_blksz during the write.
+ * This is exactly how the ZPL behaves and it ensures that the right
+ * blocksize is selected based on the file size rather than the
+ * making broad assumptions based on the osd type.
*/
- if (!lu_device_is_md(osd2lu_dev(osd))) {
- rc = -dmu_object_set_blocksize(osd->od_os,
- db->db_object,
- 128 << 10, 0, oh->ot_tx);
+ if ((fid_is_idif(fid) || fid_is_norm(fid)) && osd->od_is_ost) {
+ rc = -dmu_object_set_blocksize(osd->od_os, db->db_object,
+ osd->od_max_blksz, 0, oh->ot_tx);
if (unlikely(rc)) {
CERROR("%s: can't change blocksize: %d\n",
osd->od_svname, rc);
/* concurrent create declarations should not see
* the object inconsistent (db, attr, etc).
* in regular cases acquisition should be cheap */
- down(&obj->oo_guard);
+ down_write(&obj->oo_guard);
+
+ if (unlikely(dt_object_exists(dt)))
+ GOTO(out, rc = -EEXIST);
LASSERT(osd_invariant(obj));
- LASSERT(!dt_object_exists(dt));
LASSERT(dof != NULL);
LASSERT(th != NULL);
/* to follow ZFS on-disk format we need
* to initialize parent dnode properly */
zapid = 0;
- if (hint && hint->dah_parent)
+ if (hint != NULL && hint->dah_parent != NULL &&
+ !dt_object_remote(hint->dah_parent))
zapid = osd_dt_obj(hint->dah_parent)->oo_db->db_object;
db = osd_create_type_f(dof->dof_type)(env, obj, attr, zapid, oh);
LASSERT(osd_invariant(obj));
rc = osd_init_lma(env, obj, fid, oh);
- if (rc) {
+ if (rc != 0)
CERROR("%s: can not set LMA on "DFID": rc = %d\n",
osd->od_svname, PFID(fid), rc);
- /* ignore errors during LMA initialization */
- rc = 0;
- }
out:
- up(&obj->oo_guard);
+ up_write(&obj->oo_guard);
RETURN(rc);
}
ENTRY;
+ down_read(&obj->oo_guard);
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = -ENOENT);
+
LASSERT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt));
LASSERT(obj->oo_sa_hdl != NULL);
oh = container_of0(handle, struct osd_thandle, ot_super);
write_unlock(&obj->oo_attr_lock);
rc = osd_object_sa_update(obj, SA_ZPL_LINKS(osd), &nlink, 8, oh);
- return rc;
+
+out:
+ up_read(&obj->oo_guard);
+ RETURN(rc);
}
static int osd_declare_object_ref_del(const struct lu_env *env,
ENTRY;
+ down_read(&obj->oo_guard);
+
+ if (unlikely(!dt_object_exists(dt) || obj->oo_destroyed))
+ GOTO(out, rc = -ENOENT);
+
LASSERT(osd_invariant(obj));
- LASSERT(dt_object_exists(dt));
LASSERT(obj->oo_sa_hdl != NULL);
oh = container_of0(handle, struct osd_thandle, ot_super);
write_unlock(&obj->oo_attr_lock);
rc = osd_object_sa_update(obj, SA_ZPL_LINKS(osd), &nlink, 8, oh);
- return rc;
+
+out:
+ up_read(&obj->oo_guard);
+ RETURN(rc);
}
static int osd_object_sync(const struct lu_env *env, struct dt_object *dt,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff