/*
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
- */
-/*
- * Copyright (c) 2012, 2013, Intel Corporation.
- * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Johann Lombardi <johann@whamcloud.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_OSD
#include <lustre_ver.h>
#include <sys/sa_impl.h>
#include <sys/txg.h>
-static char *osd_obj_tag = "osd_object";
+char *osd_obj_tag = "osd_object";
static struct dt_object_operations osd_obj_ops;
static struct lu_object_operations osd_lu_obj_ops;
}
static int
-osd_object_sa_init(struct osd_object *obj, udmu_objset_t *uos)
+osd_object_sa_init(struct osd_object *obj, struct osd_device *o)
{
int rc;
LASSERT(obj->oo_sa_hdl == NULL);
LASSERT(obj->oo_db != NULL);
- rc = -sa_handle_get(uos->os, obj->oo_db->db_object, obj,
+ rc = -sa_handle_get(o->od_os, obj->oo_db->db_object, obj,
SA_HDL_PRIVATE, &obj->oo_sa_hdl);
if (rc)
return rc;
/* Cache the xattr object id, valid for the life of the object */
- rc = -sa_lookup(obj->oo_sa_hdl, SA_ZPL_XATTR(uos), &obj->oo_xattr, 8);
+ rc = -sa_lookup(obj->oo_sa_hdl, SA_ZPL_XATTR(o), &obj->oo_xattr, 8);
if (rc == -ENOENT) {
obj->oo_xattr = ZFS_NO_OBJECT;
rc = 0;
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,
- struct osd_object, oo_sa_linkage);
+ 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);
/*
* Retrieve the attributes of a DMU object
*/
-int __osd_object_attr_get(const struct lu_env *env, udmu_objset_t *uos,
+int __osd_object_attr_get(const struct lu_env *env, struct osd_device *o,
struct osd_object *obj, struct lu_attr *la)
{
struct osa_attr *osa = &osd_oti_get(env)->oti_osa;
LASSERT(obj->oo_db != NULL);
- rc = -sa_handle_get(uos->os, obj->oo_db->db_object, NULL,
+ rc = -sa_handle_get(o->od_os, obj->oo_db->db_object, NULL,
SA_HDL_PRIVATE, &sa_hdl);
if (rc)
RETURN(rc);
la->la_valid |= LA_ATIME | LA_MTIME | LA_CTIME | LA_MODE | LA_TYPE |
LA_SIZE | LA_UID | LA_GID | LA_FLAGS | LA_NLINK;
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(uos), NULL, osa->atime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(uos), NULL, osa->mtime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(uos), NULL, osa->ctime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(uos), NULL, &osa->mode, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(uos), NULL, &osa->size, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(uos), NULL, &osa->nlink, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(uos), NULL, &osa->uid, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(uos), NULL, &osa->gid, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(uos), NULL, &osa->flags, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(o), NULL, osa->atime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(o), NULL, osa->mtime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(o), NULL, osa->ctime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(o), NULL, &osa->mode, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(o), NULL, &osa->size, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(o), NULL, &osa->nlink, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(o), NULL, &osa->uid, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(o), NULL, &osa->gid, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(o), NULL, &osa->flags, 8);
rc = -sa_bulk_lookup(sa_hdl, bulk, cnt);
if (rc)
la->la_size = osa->size;
if (S_ISCHR(la->la_mode) || S_ISBLK(la->la_mode)) {
- rc = -sa_lookup(sa_hdl, SA_ZPL_RDEV(uos), &osa->rdev, 8);
+ rc = -sa_lookup(sa_hdl, SA_ZPL_RDEV(o), &osa->rdev, 8);
if (rc)
GOTO(out_bulk, rc);
la->la_rdev = osa->rdev;
}
int __osd_obj2dbuf(const struct lu_env *env, objset_t *os,
- uint64_t oid, dmu_buf_t **dbp, void *tag)
+ uint64_t oid, dmu_buf_t **dbp)
{
dmu_object_info_t *doi = &osd_oti_get(env)->oti_doi;
int rc;
- LASSERT(tag);
-
- rc = -sa_buf_hold(os, oid, tag, dbp);
+ rc = -sa_buf_hold(os, oid, osd_obj_tag, dbp);
if (rc)
return rc;
dmu_object_info_from_db(*dbp, doi);
if (unlikely (oid != DMU_USERUSED_OBJECT &&
oid != DMU_GROUPUSED_OBJECT && doi->doi_bonus_type != DMU_OT_SA)) {
- sa_buf_rele(*dbp, tag);
+ sa_buf_rele(*dbp, osd_obj_tag);
*dbp = NULL;
return -EINVAL;
}
{
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_LIST_HEAD(&mo->oo_unlinked_linkage);
init_rwsem(&mo->oo_sem);
sema_init(&mo->oo_guard, 1);
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);
- udmu_objset_t *uos = &osd->od_objset;
- 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;
/* object exist */
- rc = osd_object_sa_init(obj, uos);
+ rc = osd_object_sa_init(obj, osd);
if (rc)
RETURN(rc);
/* cache attrs in object */
- rc = __osd_object_attr_get(env, &osd->od_objset,
- obj, &obj->oo_attr);
+ rc = __osd_object_attr_get(env, osd, obj, &obj->oo_attr);
if (rc)
RETURN(rc);
*/
obj->oo_dt.do_lu.lo_header->loh_attr |= obj->oo_attr.la_mode & S_IFMT;
- cfs_mb();
+ smp_mb();
obj->oo_dt.do_lu.lo_header->loh_attr |= LOHA_EXISTS;
RETURN(0);
buf.lb_buf = lma;
buf.lb_len = sizeof(info->oti_buf);
- rc = osd_xattr_get(env, &obj->oo_dt, &buf, XATTR_NAME_LMA, BYPASS_CAPA);
+ rc = osd_xattr_get(env, &obj->oo_dt, &buf, XATTR_NAME_LMA);
if (rc > 0) {
rc = 0;
lustre_lma_swab(lma);
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_objset.os, oid,
- &obj->oo_db, osd_obj_tag);
+ rc = __osd_obj2dbuf(env, osd->od_os, oid, &obj->oo_db);
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);
- udmu_objset_t *uos = &osd->od_objset;
- 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;
+
+ down(&obj->oo_guard);
- 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;
+ if (likely(list_empty(&obj->oo_unlinked_linkage))) {
+ list_add(&obj->oo_unlinked_linkage, &oh->ot_unlinked_list);
+ rc = 0;
+ }
- dmu_tx_hold_free(tx, oid, 0, DMU_OBJECT_END);
+ up(&obj->oo_guard);
- rc = -udmu_zap_cursor_init(&zc, uos, oid, 0);
- if (rc)
- goto out;
-
- 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(uos->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);
-
- zap_cursor_advance(zc);
- }
- if (rc == -ENOENT)
- rc = 0;
-out_err:
- udmu_zap_cursor_fini(zc);
+ return rc;
+}
+
+/* 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);
+CFS_MODULE_PARM(osd_sync_destroy_max_size, "ul", ulong, 0444,
+ "Maximum object size to use synchronous destroy.");
+
+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(&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(&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);
-}
-
-int __osd_object_free(udmu_objset_t *uos, uint64_t oid, dmu_tx_t *tx)
-{
- LASSERT(uos->objects != 0);
- spin_lock(&uos->lock);
- uos->objects--;
- spin_unlock(&uos->lock);
-
- return -dmu_object_free(uos->os, oid, tx);
-}
-
-/*
- * 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);
- udmu_objset_t *uos = &osd->od_objset;
- 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 = -udmu_zap_cursor_init(&zc, uos, 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(uos->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 = __osd_object_free(uos, xid, tx);
- if (rc)
- CERROR("%s: fetch xattr %s failed: rc = %d\n",
- osd->od_svname, za->za_name, rc);
- zap_cursor_advance(zc);
- }
- udmu_zap_cursor_fini(zc);
+ if (rc)
+ RETURN(rc);
- rc = __osd_object_free(uos, 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 __osd_object_free(uos, 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;
LASSERT(obj->oo_db != NULL);
LASSERT(oh != NULL);
LASSERT(oh->ot_tx != NULL);
+ /* 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(%s) failed: rc = %d\n",
+ osd->od_svname, buf, rc);
+ GOTO(out, rc);
+ }
- /* remove obj ref from index dir (it depends) */
- rc = -zap_remove(osd->od_objset.os, zapid, buf, oh->ot_tx);
+ rc = osd_xattrs_destroy(env, obj, oh);
if (rc) {
- CERROR("%s: zap_remove() failed: rc = %d\n",
- osd->od_svname, rc);
+ CERROR("%s: cannot destroy xattrs for %s: rc = %d\n",
+ osd->od_svname, buf, rc);
GOTO(out, rc);
}
/* Remove object from inode accounting. It is not fatal for the destroy
* 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_objset.os, osd->od_iusr_oid,
- obj->oo_attr.la_uid, -1, oh->ot_tx);
+ rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
+ 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);
- rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+ " %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);
- /* 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);
+ oid = obj->oo_db->db_object;
+ 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);
+
+ 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;
RETURN (0);
}
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;
}
}
static int osd_attr_get(const struct lu_env *env,
struct dt_object *dt,
- struct lu_attr *attr,
- struct lustre_capa *capa)
+ struct lu_attr *attr)
{
struct osd_object *obj = osd_dt_obj(dt);
uint64_t blocks;
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;
oh = container_of0(handle, struct osd_thandle, ot_super);
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);
sa_object_size(obj->oo_sa_hdl, &blksize, &bspace);
bspace = toqb(bspace * blksize);
* to a transaction group.
*/
static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
- const struct lu_attr *la, struct thandle *handle,
- struct lustre_capa *capa)
+ const struct lu_attr *la, struct thandle *handle)
{
struct osd_object *obj = osd_dt_obj(dt);
struct osd_device *osd = osd_obj2dev(obj);
- udmu_objset_t *uos = &osd->od_objset;
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,
+ rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
la->la_uid, 1, oh->ot_tx);
if (rc)
CERROR("%s: failed to update accounting ZAP for user "
"%d (%d)\n", osd->od_svname, la->la_uid, rc);
- rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+ rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
obj->oo_attr.la_uid, -1, oh->ot_tx);
if (rc)
CERROR("%s: failed to update accounting ZAP for user "
"%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,
+ rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
la->la_gid, 1, oh->ot_tx);
if (rc)
CERROR("%s: failed to update accounting ZAP for user "
"%d (%d)\n", osd->od_svname, la->la_gid, rc);
- rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+ 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 update accounting ZAP for user "
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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(osd), 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);
osa->mode = obj->oo_attr.la_mode;
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(uos), NULL,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_RDEV(osd), 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 */
obj->oo_attr.la_flags = attrs_zfs2fs(osa->flags);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(uos), NULL,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(osd), 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,
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(osd), 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);
static void osd_ah_init(const struct lu_env *env, struct dt_allocation_hint *ah,
struct dt_object *parent, struct dt_object *child,
- cfs_umode_t child_mode)
+ umode_t child_mode)
{
LASSERT(ah);
- memset(ah, 0, sizeof(*ah));
ah->dah_parent = parent;
ah->dah_mode = child_mode;
}
switch (dof->dof_type) {
case DFT_DIR:
+ dt->do_index_ops = &osd_dir_ops;
case DFT_INDEX:
/* for zap create */
dmu_tx_hold_zap(oh->ot_tx, DMU_NEW_OBJECT, 1, NULL);
RETURN(rc);
}
-int __osd_attr_init(const struct lu_env *env, udmu_objset_t *uos, uint64_t oid,
- dmu_tx_t *tx, struct lu_attr *la, uint64_t parent)
+int __osd_attr_init(const struct lu_env *env, struct osd_device *osd,
+ uint64_t oid, dmu_tx_t *tx, struct lu_attr *la,
+ uint64_t parent)
{
sa_bulk_attr_t *bulk;
sa_handle_t *sa_hdl;
osa->size = la->la_size;
/* Now add in all of the "SA" attributes */
- rc = -sa_handle_get(uos->os, oid, NULL, SA_HDL_PRIVATE, &sa_hdl);
+ rc = -sa_handle_get(osd->od_os, oid, NULL, SA_HDL_PRIVATE, &sa_hdl);
if (rc)
return rc;
* work around the problem. See ORI-610.
*/
cnt = 0;
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(uos), NULL, &osa->mode, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(uos), NULL, &osa->size, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GEN(uos), NULL, &gen, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(uos), NULL, &osa->uid, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(uos), NULL, &osa->gid, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_PARENT(uos), NULL, &parent, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(uos), NULL, &osa->flags, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(uos), NULL, osa->atime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(uos), NULL, osa->mtime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(uos), NULL, osa->ctime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(uos), NULL, crtime, 16);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(uos), NULL, &osa->nlink, 8);
- SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_RDEV(uos), NULL, &osa->rdev, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MODE(osd), NULL, &osa->mode, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_SIZE(osd), NULL, &osa->size, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GEN(osd), NULL, &gen, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_UID(osd), NULL, &osa->uid, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_GID(osd), NULL, &osa->gid, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_PARENT(osd), NULL, &parent, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_FLAGS(osd), NULL, &osa->flags, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_ATIME(osd), NULL, osa->atime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_MTIME(osd), NULL, osa->mtime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CTIME(osd), NULL, osa->ctime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_CRTIME(osd), NULL, crtime, 16);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_LINKS(osd), NULL, &osa->nlink, 8);
+ SA_ADD_BULK_ATTR(bulk, cnt, SA_ZPL_RDEV(osd), NULL, &osa->rdev, 8);
rc = -sa_replace_all_by_template(sa_hdl, bulk, cnt, tx);
* dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT) called and then assigned
* to a transaction group.
*/
-int __osd_object_create(const struct lu_env *env, udmu_objset_t *uos,
+int __osd_object_create(const struct lu_env *env, struct osd_object *obj,
dmu_buf_t **dbp, dmu_tx_t *tx, struct lu_attr *la,
- uint64_t parent, void *tag)
+ uint64_t parent)
{
- uint64_t oid;
- int rc;
-
- LASSERT(tag);
- spin_lock(&uos->lock);
- uos->objects++;
- spin_unlock(&uos->lock);
+ uint64_t oid;
+ int rc;
+ struct osd_device *osd = osd_obj2dev(obj);
+ const struct lu_fid *fid = lu_object_fid(&obj->oo_dt.do_lu);
+ dmu_object_type_t type = DMU_OT_PLAIN_FILE_CONTENTS;
/* Assert that the transaction has been assigned to a
transaction group. */
LASSERT(tx->tx_txg != 0);
+ /* Use DMU_OTN_UINT8_METADATA for local objects so their data blocks
+ * would get an additional ditto copy */
+ if (unlikely(S_ISREG(la->la_mode) &&
+ fid_seq_is_local_file(fid_seq(fid))))
+ type = DMU_OTN_UINT8_METADATA;
+
/* Create a new DMU object. */
- oid = dmu_object_alloc(uos->os, DMU_OT_PLAIN_FILE_CONTENTS, 0,
+ oid = dmu_object_alloc(osd->od_os, type, 0,
DMU_OT_SA, DN_MAX_BONUSLEN, tx);
- rc = -sa_buf_hold(uos->os, oid, tag, dbp);
- if (rc)
- return rc;
+ rc = -sa_buf_hold(osd->od_os, oid, osd_obj_tag, dbp);
+ 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, osd, oid, tx, la, parent);
+ if (rc != 0) {
+ sa_buf_rele(*dbp, osd_obj_tag);
+ *dbp = NULL;
+ dmu_object_free(osd->od_os, oid, tx);
+ return rc;
+ }
+
+ return 0;
}
/*
* will also require a FAT ZAP. If there is a new type of micro ZAP created
* then we might need to re-evaluate the use of this flag and instead do
* a conversion from the different internal ZAP hash formats being used. */
-int __osd_zap_create(const struct lu_env *env, udmu_objset_t *uos,
+int __osd_zap_create(const struct lu_env *env, struct osd_device *osd,
dmu_buf_t **zap_dbp, dmu_tx_t *tx,
- struct lu_attr *la, uint64_t parent,
- void *tag, zap_flags_t flags)
+ struct lu_attr *la, uint64_t parent, zap_flags_t flags)
{
uint64_t oid;
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 = zap_create_flags(uos->os, 0, flags | ZAP_FLAG_HASH64,
- DMU_OT_DIRECTORY_CONTENTS, 12, 12,
+ 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);
- rc = -sa_buf_hold(uos->os, oid, tag, zap_dbp);
+ rc = -sa_buf_hold(osd->od_os, oid, osd_obj_tag, zap_dbp);
if (rc)
return rc;
la->la_size = 2;
la->la_nlink = 1;
- return __osd_attr_init(env, uos, oid, tx, la, parent);
+ return __osd_attr_init(env, osd, oid, tx, la, parent);
}
-static dmu_buf_t *osd_mkidx(const struct lu_env *env, struct osd_device *osd,
+static dmu_buf_t *osd_mkidx(const struct lu_env *env, struct osd_object *obj,
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
* We set ZAP_FLAG_UINT64_KEY to let ZFS know than we are going to use
* binary keys */
LASSERT(S_ISREG(la->la_mode));
- rc = __osd_zap_create(env, &osd->od_objset, &db, oh->ot_tx, la,
- parent, osd_obj_tag, ZAP_FLAG_UINT64_KEY);
+ rc = __osd_zap_create(env, osd_obj2dev(obj), &db, oh->ot_tx, la, parent,
+ ZAP_FLAG_UINT64_KEY);
if (rc)
return ERR_PTR(rc);
return db;
}
-static dmu_buf_t *osd_mkdir(const struct lu_env *env, struct osd_device *osd,
+static dmu_buf_t *osd_mkdir(const struct lu_env *env, struct osd_object *obj,
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
int rc;
LASSERT(S_ISDIR(la->la_mode));
- rc = __osd_zap_create(env, &osd->od_objset, &db, oh->ot_tx, la,
- parent, osd_obj_tag, 0);
+ rc = __osd_zap_create(env, osd_obj2dev(obj), &db,
+ oh->ot_tx, la, parent, 0);
if (rc)
return ERR_PTR(rc);
return db;
}
-static dmu_buf_t* osd_mkreg(const struct lu_env *env, struct osd_device *osd,
+static dmu_buf_t *osd_mkreg(const struct lu_env *env, struct osd_object *obj,
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
- dmu_buf_t *db;
- int rc;
+ dmu_buf_t *db;
+ int rc;
+ struct osd_device *osd = osd_obj2dev(obj);
LASSERT(S_ISREG(la->la_mode));
- rc = __osd_object_create(env, &osd->od_objset, &db, oh->ot_tx, la,
- parent, osd_obj_tag);
+ rc = __osd_object_create(env, obj, &db, oh->ot_tx, la, parent);
if (rc)
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
- */
if (!lu_device_is_md(osd2lu_dev(osd))) {
- rc = -dmu_object_set_blocksize(osd->od_objset.os,
- db->db_object,
- 128 << 10, 0, oh->ot_tx);
+ /* uses 4K as default block size because clients write data
+ * with page size that is 4K at minimum */
+ rc = -dmu_object_set_blocksize(osd->od_os, db->db_object,
+ 4096, 0, oh->ot_tx);
if (unlikely(rc)) {
CERROR("%s: can't change blocksize: %d\n",
osd->od_svname, rc);
return db;
}
-static dmu_buf_t *osd_mksym(const struct lu_env *env, struct osd_device *osd,
+static dmu_buf_t *osd_mksym(const struct lu_env *env, struct osd_object *obj,
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
int rc;
LASSERT(S_ISLNK(la->la_mode));
- rc = __osd_object_create(env, &osd->od_objset, &db, oh->ot_tx, la,
- parent, osd_obj_tag);
+ rc = __osd_object_create(env, obj, &db, oh->ot_tx, la, parent);
if (rc)
return ERR_PTR(rc);
return db;
}
-static dmu_buf_t *osd_mknod(const struct lu_env *env, struct osd_device *osd,
+static dmu_buf_t *osd_mknod(const struct lu_env *env, struct osd_object *obj,
struct lu_attr *la, uint64_t parent,
struct osd_thandle *oh)
{
if (S_ISCHR(la->la_mode) || S_ISBLK(la->la_mode))
la->la_valid |= LA_RDEV;
- rc = __osd_object_create(env, &osd->od_objset, &db, oh->ot_tx, la,
- parent, osd_obj_tag);
+ rc = __osd_object_create(env, obj, &db, oh->ot_tx, la, parent);
if (rc)
return ERR_PTR(rc);
return db;
}
typedef dmu_buf_t *(*osd_obj_type_f)(const struct lu_env *env,
- struct osd_device *osd,
+ struct osd_object *obj,
struct lu_attr *la,
uint64_t parent,
struct osd_thandle *oh);
struct lu_buf buf;
int rc;
- lustre_lma_init(lma, fid, 0);
+ lustre_lma_init(lma, fid, 0, 0);
lustre_lma_swab(lma);
buf.lb_buf = lma;
buf.lb_len = sizeof(*lma);
rc = osd_xattr_set_internal(env, obj, &buf, XATTR_NAME_LMA,
- LU_XATTR_CREATE, oh, BYPASS_CAPA);
+ LU_XATTR_CREATE, oh);
return rc;
}
/* 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, osd, attr, zapid, oh);
+ db = osd_create_type_f(dof->dof_type)(env, obj, attr, zapid, oh);
if (IS_ERR(db))
- GOTO(out, rc = PTR_ERR(th));
+ GOTO(out, rc = PTR_ERR(db));
zde->zde_pad = 0;
zde->zde_dnode = db->db_object;
zapid = osd_get_name_n_idx(env, osd, fid, buf);
- rc = -zap_add(osd->od_objset.os, zapid, buf, 8, 1, zde, oh->ot_tx);
+ rc = -zap_add(osd->od_os, zapid, buf, 8, 1, zde, oh->ot_tx);
if (rc)
GOTO(out, rc);
/* Add new object to inode accounting.
* Errors are not considered as fatal */
- rc = -zap_increment_int(osd->od_objset.os, osd->od_iusr_oid,
+ rc = -zap_increment_int(osd->od_os, osd->od_iusr_oid,
(attr->la_valid & LA_UID) ? attr->la_uid : 0, 1,
oh->ot_tx);
if (rc)
CERROR("%s: failed to add "DFID" to accounting ZAP for usr %d "
"(%d)\n", osd->od_svname, PFID(fid), attr->la_uid, rc);
- rc = -zap_increment_int(osd->od_objset.os, osd->od_igrp_oid,
+ rc = -zap_increment_int(osd->od_os, osd->od_igrp_oid,
(attr->la_valid & LA_GID) ? attr->la_gid : 0, 1,
oh->ot_tx);
if (rc)
struct osd_object *obj = osd_dt_obj(dt);
struct osd_thandle *oh;
struct osd_device *osd = osd_obj2dev(obj);
- udmu_objset_t *uos = &osd->od_objset;
uint64_t nlink;
int rc;
nlink = ++obj->oo_attr.la_nlink;
write_unlock(&obj->oo_attr_lock);
- rc = osd_object_sa_update(obj, SA_ZPL_LINKS(uos), &nlink, 8, oh);
+ rc = osd_object_sa_update(obj, SA_ZPL_LINKS(osd), &nlink, 8, oh);
return rc;
}
struct osd_object *obj = osd_dt_obj(dt);
struct osd_thandle *oh;
struct osd_device *osd = osd_obj2dev(obj);
- udmu_objset_t *uos = &osd->od_objset;
uint64_t nlink;
int rc;
nlink = --obj->oo_attr.la_nlink;
write_unlock(&obj->oo_attr_lock);
- rc = osd_object_sa_update(obj, SA_ZPL_LINKS(uos), &nlink, 8, oh);
+ rc = osd_object_sa_update(obj, SA_ZPL_LINKS(osd), &nlink, 8, oh);
return rc;
}
-static int capa_is_sane(const struct lu_env *env, struct osd_device *dev,
- struct lustre_capa *capa, struct lustre_capa_key *keys)
-{
- struct osd_thread_info *oti = osd_oti_get(env);
- struct obd_capa *oc;
- int i, rc = 0;
- ENTRY;
-
- oc = capa_lookup(dev->od_capa_hash, capa, 0);
- if (oc) {
- if (capa_is_expired(oc)) {
- DEBUG_CAPA(D_ERROR, capa, "expired");
- rc = -ESTALE;
- }
- capa_put(oc);
- RETURN(rc);
- }
-
- spin_lock(&capa_lock);
- for (i = 0; i < 2; i++) {
- if (keys[i].lk_keyid == capa->lc_keyid) {
- oti->oti_capa_key = keys[i];
- break;
- }
- }
- spin_unlock(&capa_lock);
-
- if (i == 2) {
- DEBUG_CAPA(D_ERROR, capa, "no matched capa key");
- RETURN(-ESTALE);
- }
-
- rc = capa_hmac(oti->oti_capa.lc_hmac, capa, oti->oti_capa_key.lk_key);
- if (rc)
- RETURN(rc);
- if (memcmp(oti->oti_capa.lc_hmac, capa->lc_hmac, sizeof(capa->lc_hmac)))
- {
- DEBUG_CAPA(D_ERROR, capa, "HMAC mismatch");
- RETURN(-EACCES);
- }
-
- oc = capa_add(dev->od_capa_hash, capa);
- capa_put(oc);
-
- RETURN(0);
-}
-
-static int osd_object_auth(const struct lu_env *env, struct dt_object *dt,
- struct lustre_capa *capa, __u64 opc)
-{
- const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
- struct osd_device *dev = osd_dev(dt->do_lu.lo_dev);
- int rc;
-
- if (!dev->od_fl_capa)
- return 0;
-
- if (capa == BYPASS_CAPA)
- return 0;
-
- if (!capa) {
- CERROR("no capability is provided for fid "DFID"\n", PFID(fid));
- return -EACCES;
- }
-
- if (!lu_fid_eq(fid, &capa->lc_fid)) {
- DEBUG_CAPA(D_ERROR, capa, "fid "DFID" mismatch with",PFID(fid));
- return -EACCES;
- }
-
- if (!capa_opc_supported(capa, opc)) {
- DEBUG_CAPA(D_ERROR, capa, "opc "LPX64" not supported by", opc);
- return -EACCES;
- }
-
- if ((rc = capa_is_sane(env, dev, capa, dev->od_capa_keys))) {
- DEBUG_CAPA(D_ERROR, capa, "insane (rc %d)", rc);
- return -EACCES;
- }
-
- return 0;
-}
-
-static struct obd_capa *osd_capa_get(const struct lu_env *env,
- struct dt_object *dt,
- struct lustre_capa *old,
- __u64 opc)
-{
- struct osd_thread_info *info = osd_oti_get(env);
- const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
- struct osd_object *obj = osd_dt_obj(dt);
- struct osd_device *dev = osd_obj2dev(obj);
- struct lustre_capa_key *key = &info->oti_capa_key;
- struct lustre_capa *capa = &info->oti_capa;
- struct obd_capa *oc;
- int rc;
- ENTRY;
-
- if (!dev->od_fl_capa)
- RETURN(ERR_PTR(-ENOENT));
-
- LASSERT(dt_object_exists(dt));
- LASSERT(osd_invariant(obj));
-
- /* renewal sanity check */
- if (old && osd_object_auth(env, dt, old, opc))
- RETURN(ERR_PTR(-EACCES));
-
- capa->lc_fid = *fid;
- capa->lc_opc = opc;
- capa->lc_uid = 0;
- capa->lc_flags = dev->od_capa_alg << 24;
- capa->lc_timeout = dev->od_capa_timeout;
- capa->lc_expiry = 0;
-
- oc = capa_lookup(dev->od_capa_hash, capa, 1);
- if (oc) {
- LASSERT(!capa_is_expired(oc));
- RETURN(oc);
- }
-
- spin_lock(&capa_lock);
- *key = dev->od_capa_keys[1];
- spin_unlock(&capa_lock);
-
- capa->lc_keyid = key->lk_keyid;
- capa->lc_expiry = cfs_time_current_sec() + dev->od_capa_timeout;
-
- rc = capa_hmac(capa->lc_hmac, capa, key->lk_key);
- if (rc) {
- DEBUG_CAPA(D_ERROR, capa, "HMAC failed: %d for", rc);
- LBUG();
- RETURN(ERR_PTR(rc));
- }
-
- oc = capa_add(dev->od_capa_hash, capa);
- 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 */
- txg_wait_synced(dmu_objset_pool(osd->od_objset.os), 0ULL);
+ * 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_os), 0ULL);
RETURN(0);
}
.do_declare_xattr_del = osd_declare_xattr_del,
.do_xattr_del = osd_xattr_del,
.do_xattr_list = osd_xattr_list,
- .do_capa_get = osd_capa_get,
.do_object_sync = osd_object_sync,
};
static int osd_otable_it_attr_get(const struct lu_env *env,
struct dt_object *dt,
- struct lu_attr *attr,
- struct lustre_capa *capa)
+ struct lu_attr *attr)
{
attr->la_valid = 0;
return 0;
.do_attr_get = osd_otable_it_attr_get,
.do_index_try = osd_index_try,
};
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff