* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
}
/*
+ * the following set of functions are used to maintain per-thread
+ * cache of FID->ino mapping. this mechanism is needed to resolve
+ * FID to inode at dt_insert() which in turn stores ino in the
+ * directory entries to keep ldiskfs compatible with ext[34].
+ * due to locking-originated restrictions we can't lookup ino
+ * using LU cache (deadlock is possible). lookup using OI is quite
+ * expensive. so instead we maintain this cache and methods like
+ * dt_create() fill it. so in the majority of cases dt_insert() is
+ * able to find needed mapping in lockless manner.
+ */
+static struct osd_idmap_cache *
+osd_idc_find(const struct lu_env *env, struct osd_device *osd,
+ const struct lu_fid *fid)
+{
+ struct osd_thread_info *oti = osd_oti_get(env);
+ struct osd_idmap_cache *idc = oti->oti_ins_cache;
+ int i;
+ for (i = 0; i < oti->oti_ins_cache_used; i++) {
+ if (!lu_fid_eq(&idc[i].oic_fid, fid))
+ continue;
+ if (idc[i].oic_dev != osd)
+ continue;
+
+ return idc + i;
+ }
+
+ return NULL;
+}
+
+static struct osd_idmap_cache *
+osd_idc_add(const struct lu_env *env, struct osd_device *osd,
+ const struct lu_fid *fid)
+{
+ struct osd_thread_info *oti = osd_oti_get(env);
+ struct osd_idmap_cache *idc;
+ int i;
+
+ if (unlikely(oti->oti_ins_cache_used >= oti->oti_ins_cache_size)) {
+ i = oti->oti_ins_cache_size * 2;
+ if (i == 0)
+ i = OSD_INS_CACHE_SIZE;
+ OBD_ALLOC(idc, sizeof(*idc) * i);
+ if (idc == NULL)
+ return ERR_PTR(-ENOMEM);
+ if (oti->oti_ins_cache != NULL) {
+ memcpy(idc, oti->oti_ins_cache,
+ oti->oti_ins_cache_used * sizeof(*idc));
+ OBD_FREE(oti->oti_ins_cache,
+ oti->oti_ins_cache_used * sizeof(*idc));
+ }
+ oti->oti_ins_cache = idc;
+ oti->oti_ins_cache_size = i;
+ }
+
+ idc = oti->oti_ins_cache + oti->oti_ins_cache_used++;
+ idc->oic_fid = *fid;
+ idc->oic_dev = osd;
+ idc->oic_lid.oii_ino = 0;
+ idc->oic_lid.oii_gen = 0;
+ idc->oic_remote = 0;
+
+ return idc;
+}
+
+/*
+ * lookup mapping for the given fid in the cache, initialize a
+ * new one if not found. the initialization checks whether the
+ * object is local or remote. for local objects, OI is used to
+ * learn ino/generation. the function is used when the caller
+ * has no information about the object, e.g. at dt_insert().
+ */
+static struct osd_idmap_cache *
+osd_idc_find_or_init(const struct lu_env *env, struct osd_device *osd,
+ const struct lu_fid *fid)
+{
+ struct osd_idmap_cache *idc;
+ int rc;
+
+ idc = osd_idc_find(env, osd, fid);
+ LASSERT(!IS_ERR(idc));
+ if (idc != NULL)
+ return idc;
+
+ /* new mapping is needed */
+ idc = osd_idc_add(env, osd, fid);
+ if (IS_ERR(idc))
+ return idc;
+
+ /* initialize it */
+ rc = osd_remote_fid(env, osd, fid);
+ if (unlikely(rc < 0))
+ return ERR_PTR(rc);
+
+ if (rc == 0) {
+ /* the object is local, lookup in OI */
+ /* XXX: probably cheaper to lookup in LU first? */
+ rc = osd_oi_lookup(osd_oti_get(env), osd, fid,
+ &idc->oic_lid, 0);
+ if (unlikely(rc < 0)) {
+ CERROR("can't lookup: rc = %d\n", rc);
+ return ERR_PTR(rc);
+ }
+ } else {
+ /* the object is remote */
+ idc->oic_remote = 1;
+ }
+
+ return idc;
+}
+
+/*
+ * lookup mapping for given FID and fill it from the given object.
+ * the object is lolcal by definition.
+ */
+static int osd_idc_find_and_init(const struct lu_env *env,
+ struct osd_device *osd,
+ struct osd_object *obj)
+{
+ const struct lu_fid *fid = lu_object_fid(&obj->oo_dt.do_lu);
+ struct osd_idmap_cache *idc;
+
+ idc = osd_idc_find(env, osd, fid);
+ LASSERT(!IS_ERR(idc));
+ if (idc != NULL) {
+ if (obj->oo_inode == NULL)
+ return 0;
+ if (idc->oic_lid.oii_ino != obj->oo_inode->i_ino) {
+ LASSERT(idc->oic_lid.oii_ino == 0);
+ idc->oic_lid.oii_ino = obj->oo_inode->i_ino;
+ idc->oic_lid.oii_gen = obj->oo_inode->i_generation;
+ }
+ return 0;
+ }
+
+ /* new mapping is needed */
+ idc = osd_idc_add(env, osd, fid);
+ if (IS_ERR(idc))
+ return PTR_ERR(idc);
+
+ if (obj->oo_inode != NULL) {
+ idc->oic_lid.oii_ino = obj->oo_inode->i_ino;
+ idc->oic_lid.oii_gen = obj->oo_inode->i_generation;
+ }
+ return 0;
+}
+
+/*
* OSD object methods.
*/
iput(inode);
inode = ERR_PTR(-ENOENT);
} else {
+ ldiskfs_clear_inode_state(inode, LDISKFS_STATE_LUSTRE_DESTROY);
if (id->oii_gen == OSD_OII_NOGEN)
osd_id_gen(id, inode->i_ino, inode->i_generation);
return inode;
}
+int osd_ldiskfs_add_entry(struct osd_thread_info *info,
+ handle_t *handle, struct dentry *child,
+ struct inode *inode, struct htree_lock *hlock)
+{
+ int rc, rc2;
+
+ rc = __ldiskfs_add_entry(handle, child, inode, hlock);
+ if (rc == -ENOBUFS || rc == -ENOSPC) {
+ char fidbuf[FID_LEN + 1];
+ struct lustre_mdt_attrs lma;
+ struct lu_fid fid = { };
+ char *errstr;
+ struct dentry *p_dentry = child->d_parent;
+
+ rc2 = osd_get_lma(info, p_dentry->d_inode, p_dentry,
+ &lma);
+ if (rc2 == 0) {
+ fid = lma.lma_self_fid;
+ snprintf(fidbuf, sizeof(fidbuf), DFID, PFID(&fid));
+ } else if (rc2 == -ENODATA) {
+ if (unlikely(p_dentry->d_inode ==
+ inode->i_sb->s_root->d_inode))
+ lu_local_obj_fid(&fid, OSD_FS_ROOT_OID);
+ else if (info->oti_dev && !info->oti_dev->od_is_ost &&
+ fid_seq_is_mdt0(fid_seq(&fid)))
+ lu_igif_build(&fid, p_dentry->d_inode->i_ino,
+ p_dentry->d_inode->i_generation);
+ snprintf(fidbuf, sizeof(fidbuf), DFID, PFID(&fid));
+ } else {
+ snprintf(fidbuf, FID_LEN, "%s", "unknown");
+ }
+
+ if (rc == -ENOSPC)
+ errstr = "has reached";
+ else
+ errstr = "is approaching";
+ CWARN("%.16s: directory (inode: %lu FID: %s) %s maximum entry limit\n",
+ LDISKFS_SB(inode->i_sb)->s_es->s_volume_name,
+ p_dentry->d_inode->i_ino, fidbuf, errstr);
+ /* ignore such error now */
+ if (rc == -ENOBUFS)
+ rc = 0;
+ }
+ return rc;
+}
+
+
static struct inode *
osd_iget_fid(struct osd_thread_info *info, struct osd_device *dev,
struct osd_inode_id *id, struct lu_fid *fid)
goto check_oi;
}
+ ldiskfs_clear_inode_state(inode, LDISKFS_STATE_LUSTRE_DESTROY);
+
check_oi:
if (rc != 0) {
LASSERTF(rc == -ESTALE || rc == -ENOENT, "rc = %d\n", rc);
rc = 0;
ostid_set_seq(ostid, le64_to_cpu(ff->ff_seq));
ostid_set_id(ostid, le64_to_cpu(ff->ff_objid));
- /* XXX: should use real OST index in the future. LU-3569 */
+ /* XXX: use 0 as the index for compatibility, the caller will
+ * handle index related issues when necessarry. */
ostid_to_fid(fid, ostid, 0);
} else if (rc == sizeof(struct filter_fid)) {
rc = 1;
LASSERT(info);
oic = &info->oti_cache;
- if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOENT))
+ if (OBD_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
RETURN(-ENOENT);
/* For the object is created as locking anchor, or for the object to
result = -EINPROGRESS;
else
result = -EREMCHG;
+ } else {
+ result = -EREMCHG;
}
if (fid_is_on_ost(info, dev, fid, OI_CHECK_FLD))
oh = container_of0(th, struct osd_thandle, ot_super);
+ /* reset OI cache for safety */
+ oti->oti_ins_cache_used = 0;
+
remove_agents = oh->ot_remove_agents;
qtrans = oh->ot_quota_trans;
ah->dah_parent = parent;
ah->dah_mode = child_mode;
+
+ if (parent != NULL && !dt_object_remote(parent)) {
+ /* will help to find FID->ino at dt_insert("..") */
+ struct osd_object *pobj = osd_dt_obj(parent);
+ osd_idc_find_and_init(env, osd_obj2dev(pobj), pobj);
+ }
}
static void osd_attr_init(struct osd_thread_info *info, struct osd_object *obj,
if (rc != 0)
RETURN(rc);
+ /* will help to find FID->ino mapping at dt_insert() */
+ rc = osd_idc_find_and_init(env, osd_obj2dev(osd_dt_obj(dt)),
+ osd_dt_obj(dt));
+
RETURN(rc);
}
int rc;
ENTRY;
+ if (inode == NULL)
+ RETURN(-ENOENT);
+
oh = container_of0(th, struct osd_thandle, ot_super);
LASSERT(oh->ot_handle == NULL);
- LASSERT(inode);
osd_trans_declare_op(env, oh, OSD_OT_DESTROY,
osd_dto_credits_noquota[DTO_OBJECT_DELETE]);
/* data to be truncated */
rc = osd_declare_inode_qid(env, i_uid_read(inode), i_gid_read(inode),
0, oh, obj, true, NULL, false);
+ if (rc)
+ RETURN(rc);
+
+ /* will help to find FID->ino when this object is being
+ * added to PENDING/ */
+ rc = osd_idc_find_and_init(env, osd_obj2dev(obj), obj);
+
RETURN(rc);
}
osd_trans_exec_op(env, th, OSD_OT_DESTROY);
+ ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_DESTROY);
result = osd_oi_delete(osd_oti_get(env), osd, fid, oh->ot_handle,
OI_CHECK_FLD);
{
struct ldiskfs_dentry_param *dot_ldp;
struct ldiskfs_dentry_param *dot_dot_ldp;
+ __u32 saved_nlink = dir->i_nlink;
+ int rc;
dot_dot_ldp = (struct ldiskfs_dentry_param *)info->oti_ldp2;
osd_get_ldiskfs_dirent_param(dot_dot_ldp, dot_dot_fid);
dot_ldp = (struct ldiskfs_dentry_param *)info->oti_ldp;
dot_ldp->edp_magic = 0;
- return ldiskfs_add_dot_dotdot(oth->ot_handle, parent_dir,
- dir, dot_ldp, dot_dot_ldp);
+ rc = ldiskfs_add_dot_dotdot(oth->ot_handle, parent_dir,
+ dir, dot_ldp, dot_dot_ldp);
+ /* The ldiskfs_add_dot_dotdot() may dir->i_nlink as 2, then
+ * the subseqent ref_add() will increase the dir->i_nlink
+ * as 3. That is incorrect for new created directory.
+ *
+ * It looks like hack, because we want to make the OSD API
+ * to be order-independent for new created directory object
+ * between dt_insert(..) and ref_add() operations.
+ *
+ * Here, we only restore the in-RAM dir-inode's nlink attr,
+ * becuase if the nlink attr is not 2, then there will be
+ * ref_add() called following the dt_insert(..), such call
+ * will make both the in-RAM and on-disk dir-inode's nlink
+ * attr to be set as 2. LU-7447 */
+ set_nlink(dir, saved_nlink);
+ return rc;
}
/**
const struct lu_fid *fid = lu_object_fid(&dt->do_lu);
struct osd_object *obj = osd_dt_obj(dt);
struct osd_thread_info *info = osd_oti_get(env);
- int result;
+ int result, on_ost = 0;
ENTRY;
fid_to_ostid(fid, oi);
ostid_to_fid(tfid, oi, 0);
+ on_ost = 1;
result = osd_ea_fid_set(info, obj->oo_inode, tfid,
LMAC_FID_ON_OST, 0);
} else {
+ on_ost = fid_is_on_ost(info, osd_obj2dev(obj),
+ fid, OI_CHECK_FLD);
result = osd_ea_fid_set(info, obj->oo_inode, fid,
- fid_is_on_ost(info, osd_obj2dev(obj),
- fid, OI_CHECK_FLD) ?
- LMAC_FID_ON_OST : 0, 0);
+ on_ost ? LMAC_FID_ON_OST : 0,
+ 0);
}
if (obj->oo_dt.do_body_ops == &osd_body_ops_new)
obj->oo_dt.do_body_ops = &osd_body_ops;
if (result == 0)
result = __osd_oi_insert(env, obj, fid, th);
+ /* a small optimization - dt_insert() isn't usually applied
+ * to OST objects, so we don't need to cache OI mapping for
+ * OST objects */
+ if (result == 0 && on_ost == 0) {
+ struct osd_device *osd = osd_dev(dt->do_lu.lo_dev);
+ result = osd_idc_find_and_init(env, osd, obj);
+ LASSERT(result == 0);
+ }
+
LASSERT(ergo(result == 0,
dt_object_exists(dt) && !dt_object_remote(dt)));
LINVRNT(osd_invariant(obj));
{
struct osd_thandle *oh;
+ if (!dt_object_exists(dt))
+ return -ENOENT;
+
LASSERT(!dt_object_remote(dt));
LASSERT(handle != NULL);
} else {
upgrade:
credits = osd_dto_credits_noquota[DTO_XATTR_SET];
- if (buf && buf->lb_len > sb->s_blocksize) {
- credits *= (buf->lb_len + sb->s_blocksize - 1) >>
- sb->s_blocksize_bits;
+
+ if (buf != NULL) {
+ ssize_t buflen;
+
+ if (buf->lb_buf == NULL && dt_object_exists(dt)) {
+ /* learn xattr size from osd_xattr_get if
+ attribute has not been read yet */
+ buflen = __osd_xattr_get(
+ osd_dt_obj(dt)->oo_inode,
+ &osd_oti_get(env)->oti_obj_dentry,
+ name, NULL, 0);
+ if (buflen < 0)
+ buflen = 0;
+ } else {
+ buflen = buf->lb_len;
+ }
+
+ if (buflen > sb->s_blocksize) {
+ credits += osd_calc_bkmap_credits(
+ sb, NULL, 0, -1,
+ (buflen + sb->s_blocksize - 1) >>
+ sb->s_blocksize_bits);
+ }
}
/*
* xattr set may involve inode quota change, reserve credits for
result = 0;
} else if (feat == &dt_directory_features) {
dt->do_index_ops = &osd_index_ea_ops;
- if (obj->oo_inode != NULL && S_ISDIR(obj->oo_inode->i_mode))
+ if (obj->oo_inode == NULL || S_ISDIR(obj->oo_inode->i_mode))
result = 0;
else
result = -ENOTDIR;
osd_dto_credits_noquota[DTO_OBJECT_DELETE]);
inode = osd_dt_obj(dt)->oo_inode;
- LASSERT(inode);
+ if (inode == NULL)
+ RETURN(-ENOENT);
rc = osd_declare_inode_qid(env, i_uid_read(inode), i_gid_read(inode),
0, oh, osd_dt_obj(dt), true, NULL, false);
child = osd_child_dentry_get(info->oti_env, pobj, name, strlen(name));
child->d_fsdata = (void *)ldp;
ll_vfs_dq_init(pobj->oo_inode);
- rc = osd_ldiskfs_add_entry(oth->ot_handle, child, cinode, hlock);
+ rc = osd_ldiskfs_add_entry(info, oth->ot_handle, child,
+ cinode, hlock);
if (rc == 0 && OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_TYPE)) {
struct ldiskfs_dir_entry_2 *de;
struct buffer_head *bh;
if (dir->oo_compat_dot_created) {
result = -EEXIST;
} else {
- LASSERT(inode == parent_dir);
+ LASSERT(inode->i_ino == parent_dir->i_ino);
dir->oo_compat_dot_created = 1;
result = 0;
}
return rc;
}
-static void
+static int
osd_consistency_check(struct osd_thread_info *oti, struct osd_device *dev,
struct osd_idmap_cache *oic)
{
ENTRY;
if (!fid_is_norm(fid) && !fid_is_igif(fid))
- RETURN_EXIT;
+ RETURN(0);
if (scrub->os_pos_current > id->oii_ino)
- RETURN_EXIT;
+ RETURN(0);
again:
- rc = osd_oi_lookup(oti, dev, fid, id, OI_CHECK_FLD);
- if (rc != 0 && rc != -ENOENT)
- RETURN_EXIT;
+ rc = osd_oi_lookup(oti, dev, fid, id, 0);
+ if (rc == -ENOENT) {
+ struct inode *inode;
- if (rc == 0 && osd_id_eq(id, &oic->oic_lid))
- RETURN_EXIT;
+ *id = oic->oic_lid;
+ inode = osd_iget(oti, dev, &oic->oic_lid);
+ /* The inode has been removed (by race maybe). */
+ if (IS_ERR(inode)) {
+ rc = PTR_ERR(inode);
+
+ RETURN(rc == -ESTALE ? -ENOENT : rc);
+ }
+
+ iput(inode);
+ /* The OI mapping is lost. */
+ if (id->oii_gen != OSD_OII_NOGEN)
+ goto trigger;
+
+ /* The inode may has been reused by others, we do not know,
+ * leave it to be handled by subsequent osd_fid_lookup(). */
+ RETURN(0);
+ } else if (rc != 0 || osd_id_eq(id, &oic->oic_lid)) {
+ RETURN(rc);
+ }
+
+trigger:
if (thread_is_running(&scrub->os_thread)) {
rc = osd_oii_insert(dev, oic, rc == -ENOENT);
/* There is race condition between osd_oi_lookup and OI scrub.
if (unlikely(rc == -EAGAIN))
goto again;
- RETURN_EXIT;
+ RETURN(0);
}
if (!dev->od_noscrub && ++once == 1) {
goto again;
}
- EXIT;
+ RETURN(0);
}
static int osd_fail_fid_lookup(struct osd_thread_info *oti,
osd_id_gen(id, ino, OSD_OII_NOGEN);
}
- if (rc != 0) {
+ if (rc != 0 || osd_remote_fid(env, dev, fid)) {
fid_zero(&oic->oic_fid);
+
GOTO(out, rc);
}
- if (osd_remote_fid(env, dev, fid))
- GOTO(out, rc = 0);
-
osd_add_oi_cache(osd_oti_get(env), osd_obj2dev(obj), id, fid);
- osd_consistency_check(oti, dev, oic);
+ rc = osd_consistency_check(oti, dev, oic);
+ if (rc != 0)
+ fid_zero(&oic->oic_fid);
} else {
rc = -ENOENT;
}
}
/**
- * Find the osd object for given fid.
- *
- * \param fid need to find the osd object having this fid
- *
- * \retval osd_object on success
- * \retval -ve on error
- */
-static struct osd_object *osd_object_find(const struct lu_env *env,
- struct dt_object *dt,
- const struct lu_fid *fid)
-{
- struct lu_device *ludev = dt->do_lu.lo_dev;
- struct osd_object *child = NULL;
- struct lu_object *luch;
- struct lu_object *lo;
-
- /*
- * at this point topdev might not exist yet
- * (i.e. MGS is preparing profiles). so we can
- * not rely on topdev and instead lookup with
- * our device passed as topdev. this can't work
- * if the object isn't cached yet (as osd doesn't
- * allocate lu_header). IOW, the object must be
- * in the cache, otherwise lu_object_alloc() crashes
- * -bzzz
- */
- luch = lu_object_find_at(env, ludev->ld_site->ls_top_dev == NULL ?
- ludev : ludev->ld_site->ls_top_dev,
- fid, NULL);
- if (!IS_ERR(luch)) {
- if (lu_object_exists(luch)) {
- lo = lu_object_locate(luch->lo_header, ludev->ld_type);
- if (lo != NULL)
- child = osd_obj(lo);
- else
- LU_OBJECT_DEBUG(D_ERROR, env, luch,
- "lu_object can't be located"
- DFID"\n", PFID(fid));
-
- if (child == NULL) {
- lu_object_put(env, luch);
- CERROR("Unable to get osd_object\n");
- child = ERR_PTR(-ENOENT);
- }
- } else {
- LU_OBJECT_DEBUG(D_ERROR, env, luch,
- "lu_object does not exists "DFID"\n",
- PFID(fid));
- lu_object_put(env, luch);
- child = ERR_PTR(-ENOENT);
- }
- } else {
- child = ERR_CAST(luch);
- }
-
- return child;
-}
-
-/**
* Put the osd object once done with it.
*
* \param obj osd object that needs to be put
{
struct osd_thandle *oh;
struct osd_device *osd = osd_dev(dt->do_lu.lo_dev);
- struct lu_fid *fid = (struct lu_fid *)rec;
+ struct dt_insert_rec *rec1 = (struct dt_insert_rec *)rec;
+ const struct lu_fid *fid = rec1->rec_fid;
int credits, rc = 0;
+ struct osd_idmap_cache *idc;
ENTRY;
LASSERT(!dt_object_remote(dt));
LASSERT(handle != NULL);
+ LASSERT(fid != NULL);
+ LASSERT(rec1->rec_type != 0);
oh = container_of0(handle, struct osd_thandle, ot_super);
LASSERT(oh->ot_handle == NULL);
credits = osd_dto_credits_noquota[DTO_INDEX_INSERT];
- if (fid != NULL) {
- rc = osd_remote_fid(env, osd, fid);
- if (unlikely(rc < 0))
- RETURN(rc);
- if (rc > 0) {
- /* a reference to remote inode is represented by an
- * agent inode which we have to create */
- credits += osd_dto_credits_noquota[DTO_OBJECT_CREATE];
- credits += osd_dto_credits_noquota[DTO_INDEX_INSERT];
- }
- rc = 0;
+
+ /* we can't call iget() while a transactions is running
+ * (this can lead to a deadlock), but we need to know
+ * inum and object type. so we find this information at
+ * declaration and cache in per-thread info */
+ idc = osd_idc_find_or_init(env, osd, fid);
+ if (IS_ERR(idc))
+ RETURN(PTR_ERR(idc));
+ if (idc->oic_remote) {
+ /* a reference to remote inode is represented by an
+ * agent inode which we have to create */
+ credits += osd_dto_credits_noquota[DTO_OBJECT_CREATE];
+ credits += osd_dto_credits_noquota[DTO_INDEX_INSERT];
}
osd_trans_declare_op(env, oh, OSD_OT_INSERT, credits);
const struct lu_fid *fid = rec1->rec_fid;
const char *name = (const char *)key;
struct osd_thread_info *oti = osd_oti_get(env);
- struct osd_inode_id *id = &oti->oti_id;
struct inode *child_inode = NULL;
- struct osd_object *child = NULL;
+ struct osd_idmap_cache *idc;
int rc;
ENTRY;
LASSERTF(fid_is_sane(fid), "fid"DFID" is insane!\n", PFID(fid));
- rc = osd_remote_fid(env, osd, fid);
- if (rc < 0) {
- CERROR("%s: Can not find object "DFID" rc %d\n",
- osd_name(osd), PFID(fid), rc);
- RETURN(rc);
+ idc = osd_idc_find(env, osd, fid);
+ if (unlikely(idc == NULL)) {
+ /* this dt_insert() wasn't declared properly, so
+ * FID is missing in OI cache. we better do not
+ * lookup FID in FLDB/OI and don't risk to deadlock,
+ * but in some special cases (lfsck testing, etc)
+ * it's much simpler than fixing a caller */
+ CERROR("%s: "DFID" wasn't declared for insert\n",
+ osd_name(osd), PFID(fid));
+ dump_stack();
+ idc = osd_idc_find_or_init(env, osd, fid);
+ if (IS_ERR(idc))
+ RETURN(PTR_ERR(idc));
}
- if (rc == 1) {
+ if (idc->oic_remote) {
/* Insert remote entry */
if (strcmp(name, dotdot) == 0 && strlen(name) == 2) {
struct osd_mdobj_map *omm = osd->od_mdt_map;
}
} else {
/* Insert local entry */
- child = osd_object_find(env, dt, fid);
- if (IS_ERR(child)) {
- CERROR("%s: Can not find object "DFID"%u:%u: rc = %d\n",
- osd_name(osd), PFID(fid),
- id->oii_ino, id->oii_gen,
- (int)PTR_ERR(child));
- RETURN(PTR_ERR(child));
+ if (unlikely(idc->oic_lid.oii_ino == 0)) {
+ /* for a reason OI cache wasn't filled properly */
+ CERROR("%s: OIC for "DFID" isn't filled\n",
+ osd_name(osd), PFID(fid));
+ RETURN(-EINVAL);
+ }
+ child_inode = oti->oti_inode;
+ if (unlikely(child_inode == NULL)) {
+ struct ldiskfs_inode_info *lii;
+ OBD_ALLOC_PTR(lii);
+ if (lii == NULL)
+ RETURN(-ENOMEM);
+ child_inode = oti->oti_inode = &lii->vfs_inode;
}
- child_inode = igrab(child->oo_inode);
+ child_inode->i_sb = osd_sb(osd);
+ child_inode->i_ino = idc->oic_lid.oii_ino;
+ child_inode->i_mode = rec1->rec_type & S_IFMT;
}
rc = osd_ea_add_rec(env, obj, child_inode, name, fid, th);
CDEBUG(D_INODE, "parent %lu insert %s:%lu rc = %d\n",
obj->oo_inode->i_ino, name, child_inode->i_ino, rc);
- iput(child_inode);
- if (child != NULL)
- osd_object_put(env, child);
+ if (child_inode && child_inode != oti->oti_inode)
+ iput(child_inode);
LASSERT(osd_invariant(obj));
osd_trans_exec_check(env, th, OSD_OT_INSERT);
RETURN(rc);
return it->oie_dirent->oied_namelen;
}
-static int
-osd_dirent_update(handle_t *jh, struct super_block *sb,
- struct osd_it_ea_dirent *ent, struct lu_fid *fid,
- struct buffer_head *bh, struct ldiskfs_dir_entry_2 *de)
+static inline bool
+osd_dot_dotdot_has_space(struct ldiskfs_dir_entry_2 *de, int dot_dotdot)
{
- struct osd_fid_pack *rec;
- int rc;
- ENTRY;
-
- LASSERT(de->file_type & LDISKFS_DIRENT_LUFID);
- LASSERT(de->rec_len >= de->name_len + sizeof(struct osd_fid_pack));
-
- rc = ldiskfs_journal_get_write_access(jh, bh);
- if (rc != 0)
- RETURN(rc);
+ LASSERTF(dot_dotdot == 1 || dot_dotdot == 2,
+ "dot_dotdot = %d\n", dot_dotdot);
- rec = (struct osd_fid_pack *)(de->name + de->name_len + 1);
- fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid);
- rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh);
+ if (LDISKFS_DIR_REC_LEN(de) >=
+ __LDISKFS_DIR_REC_LEN(dot_dotdot + 1 + sizeof(struct osd_fid_pack)))
+ return true;
- RETURN(rc);
+ return false;
}
-static inline int
-osd_dirent_has_space(__u16 reclen, __u16 namelen, unsigned blocksize)
+static inline bool
+osd_dirent_has_space(struct ldiskfs_dir_entry_2 *de, __u16 namelen,
+ unsigned blocksize, int dot_dotdot)
{
- if (ldiskfs_rec_len_from_disk(reclen, blocksize) >=
- __LDISKFS_DIR_REC_LEN(namelen + 1 + sizeof(struct osd_fid_pack)))
- return 1;
- else
- return 0;
-}
+ if (dot_dotdot > 0)
+ return osd_dot_dotdot_has_space(de, dot_dotdot);
-static inline int
-osd_dot_dotdot_has_space(struct ldiskfs_dir_entry_2 *de, int dot_dotdot)
-{
- LASSERTF(dot_dotdot == 1 || dot_dotdot == 2,
- "dot_dotdot = %d\n", dot_dotdot);
+ if (ldiskfs_rec_len_from_disk(de->rec_len, blocksize) >=
+ __LDISKFS_DIR_REC_LEN(namelen + 1 + sizeof(struct osd_fid_pack)))
+ return true;
- if (LDISKFS_DIR_REC_LEN(de) >=
- __LDISKFS_DIR_REC_LEN(dot_dotdot + 1 + sizeof(struct osd_fid_pack)))
- return 1;
- else
- return 0;
+ return false;
}
static int
osd_dirent_reinsert(const struct lu_env *env, handle_t *jh,
- struct inode *dir, struct inode *inode,
- struct osd_it_ea_dirent *ent, struct lu_fid *fid,
+ struct dentry *dentry, const struct lu_fid *fid,
struct buffer_head *bh, struct ldiskfs_dir_entry_2 *de,
- struct htree_lock *hlock)
+ struct htree_lock *hlock, int dot_dotdot)
{
- struct dentry *dentry;
+ struct inode *dir = dentry->d_parent->d_inode;
+ struct inode *inode = dentry->d_inode;
struct osd_fid_pack *rec;
struct ldiskfs_dentry_param *ldp;
+ int namelen = dentry->d_name.len;
int rc;
+ struct osd_thread_info *info = osd_oti_get(env);
ENTRY;
if (!LDISKFS_HAS_INCOMPAT_FEATURE(inode->i_sb,
RETURN(0);
/* There is enough space to hold the FID-in-dirent. */
- if (osd_dirent_has_space(de->rec_len, ent->oied_namelen,
- dir->i_sb->s_blocksize)) {
+ if (osd_dirent_has_space(de, namelen, dir->i_sb->s_blocksize,
+ dot_dotdot)) {
rc = ldiskfs_journal_get_write_access(jh, bh);
if (rc != 0)
RETURN(rc);
- de->name[de->name_len] = 0;
- rec = (struct osd_fid_pack *)(de->name + de->name_len + 1);
+ de->name[namelen] = 0;
+ rec = (struct osd_fid_pack *)(de->name + namelen + 1);
rec->fp_len = sizeof(struct lu_fid) + 1;
fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid);
de->file_type |= LDISKFS_DIRENT_LUFID;
-
rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh);
RETURN(rc);
}
+ LASSERTF(dot_dotdot == 0, "dot_dotdot = %d\n", dot_dotdot);
+
rc = ldiskfs_delete_entry(jh, dir, de, bh);
if (rc != 0)
RETURN(rc);
- dentry = osd_child_dentry_by_inode(env, dir, ent->oied_name,
- ent->oied_namelen);
ldp = (struct ldiskfs_dentry_param *)osd_oti_get(env)->oti_ldp;
osd_get_ldiskfs_dirent_param(ldp, fid);
dentry->d_fsdata = (void *)ldp;
ll_vfs_dq_init(dir);
- rc = osd_ldiskfs_add_entry(jh, dentry, inode, hlock);
+ rc = osd_ldiskfs_add_entry(info, jh, dentry, inode, hlock);
/* It is too bad, we cannot reinsert the name entry back.
* That means we lose it! */
if (rc != 0)
CDEBUG(D_LFSCK, "%.16s: fail to reinsert the dirent, "
"dir = %lu/%u, name = %.*s, "DFID": rc = %d\n",
LDISKFS_SB(inode->i_sb)->s_es->s_volume_name,
- dir->i_ino, dir->i_generation,
- ent->oied_namelen, ent->oied_name, PFID(fid), rc);
+ dir->i_ino, dir->i_generation, namelen,
+ dentry->d_name.name, PFID(fid), rc);
RETURN(rc);
}
bool dirty = false;
ENTRY;
+ osd_id_gen(id, ent->oied_ino, OSD_OII_NOGEN);
+ inode = osd_iget(info, dev, id);
+ if (IS_ERR(inode)) {
+ rc = PTR_ERR(inode);
+ if (rc == -ENOENT || rc == -ESTALE) {
+ *attr |= LUDA_UNKNOWN;
+ rc = 0;
+ } else {
+ CDEBUG(D_LFSCK, "%.16s: fail to iget for dirent "
+ "check_repair, dir = %lu/%u, name = %.*s: "
+ "rc = %d\n",
+ devname, dir->i_ino, dir->i_generation,
+ ent->oied_namelen, ent->oied_name, rc);
+ }
+
+ RETURN(rc);
+ }
+
+ dentry = osd_child_dentry_by_inode(env, dir, ent->oied_name,
+ ent->oied_namelen);
+ rc = osd_get_lma(info, inode, dentry, lma);
+ if (rc == -ENODATA)
+ lma = NULL;
+ else if (rc != 0)
+ GOTO(out, rc);
+
if (ent->oied_name[0] == '.') {
if (ent->oied_namelen == 1)
dot_dotdot = 1;
dot_dotdot = 2;
}
- dentry = osd_child_dentry_get(env, obj, ent->oied_name,
- ent->oied_namelen);
-
/* We need to ensure that the name entry is still valid.
* Because it may be removed or renamed by other already.
*
credits = osd_dto_credits_noquota[DTO_INDEX_DELETE] +
osd_dto_credits_noquota[DTO_INDEX_INSERT] + 1 + 1 + 2;
-again:
if (dev->od_dirent_journal != 0) {
+
+again:
jh = osd_journal_start_sb(sb, LDISKFS_HT_MISC, credits);
if (IS_ERR(jh)) {
rc = PTR_ERR(jh);
"name = %.*s: rc = %d\n",
devname, dir->i_ino, dir->i_generation, credits,
ent->oied_namelen, ent->oied_name, rc);
- RETURN(rc);
+
+ GOTO(out_inode, rc);
}
if (obj->oo_hl_head != NULL) {
* For the whole directory, only dot/dotdot entry have no FID-in-dirent
* and needs to get FID from LMA when readdir, it will not affect the
* performance much. */
- if ((bh == NULL) || (le32_to_cpu(de->inode) != ent->oied_ino) ||
+ if ((bh == NULL) || (le32_to_cpu(de->inode) != inode->i_ino) ||
(dot_dotdot != 0 && !osd_dot_dotdot_has_space(de, dot_dotdot))) {
*attr |= LUDA_IGNORE;
- GOTO(out_journal, rc = 0);
- }
- osd_id_gen(id, ent->oied_ino, OSD_OII_NOGEN);
- inode = osd_iget(info, dev, id);
- if (IS_ERR(inode)) {
- rc = PTR_ERR(inode);
- if (rc == -ENOENT || rc == -ESTALE)
- rc = 1;
- else
- CDEBUG(D_LFSCK, "%.16s: fail to iget for dirent "
- "check_repair, dir = %lu/%u, name = %.*s: "
- "rc = %d\n",
- devname, dir->i_ino, dir->i_generation,
- ent->oied_namelen, ent->oied_name, rc);
-
- GOTO(out_journal, rc);
+ GOTO(out, rc = 0);
}
- rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma);
- if (rc == 0) {
+ if (lma != NULL) {
if (unlikely(lma->lma_compat & LMAC_NOT_IN_OI)) {
struct lu_fid *tfid = &lma->lma_self_fid;
*attr |= LUDA_IGNORE;
-
/* It must be REMOTE_PARENT_DIR and as the
* dotdot entry of remote directory */
if (unlikely(dot_dotdot != 2 ||
ent->oied_name, dir->i_ino,
dir->i_generation, PFID(tfid));
- rc = -EIO;
+ GOTO(out, rc = -EIO);
}
-
- GOTO(out_inode, rc);
+ GOTO(out, rc = 0);
}
if (fid_is_sane(fid)) {
/* FID-in-dirent is valid. */
if (lu_fid_eq(fid, &lma->lma_self_fid))
- GOTO(out_inode, rc = 0);
+ GOTO(out, rc = 0);
/* Do not repair under dryrun mode. */
if (*attr & LUDA_VERIFY_DRYRUN) {
*attr |= LUDA_REPAIR;
- GOTO(out_inode, rc = 0);
+
+ GOTO(out, rc = 0);
}
- if (dev->od_dirent_journal == 0) {
- iput(inode);
+ if (jh == NULL) {
brelse(bh);
- if (hlock != NULL)
+ dev->od_dirent_journal = 1;
+ if (hlock != NULL) {
ldiskfs_htree_unlock(hlock);
- else
+ hlock = NULL;
+ } else {
up_read(&obj->oo_ext_idx_sem);
- dev->od_dirent_journal = 1;
+ }
+
goto again;
}
*fid = lma->lma_self_fid;
dirty = true;
/* Update the FID-in-dirent. */
- rc = osd_dirent_update(jh, sb, ent, fid, bh, de);
+ rc = osd_dirent_reinsert(env, jh, dentry, fid, bh, de,
+ hlock, dot_dotdot);
if (rc == 0)
*attr |= LUDA_REPAIR;
else
if (*attr & LUDA_VERIFY_DRYRUN) {
*fid = lma->lma_self_fid;
*attr |= LUDA_REPAIR;
- GOTO(out_inode, rc = 0);
+
+ GOTO(out, rc = 0);
}
- if (dev->od_dirent_journal == 0) {
- iput(inode);
+ if (jh == NULL) {
brelse(bh);
- if (hlock != NULL)
+ dev->od_dirent_journal = 1;
+ if (hlock != NULL) {
ldiskfs_htree_unlock(hlock);
- else
+ hlock = NULL;
+ } else {
up_read(&obj->oo_ext_idx_sem);
- dev->od_dirent_journal = 1;
+ }
+
goto again;
}
*fid = lma->lma_self_fid;
dirty = true;
/* Append the FID-in-dirent. */
- rc = osd_dirent_reinsert(env, jh, dir, inode, ent,
- fid, bh, de, hlock);
+ rc = osd_dirent_reinsert(env, jh, dentry, fid, bh, de,
+ hlock, dot_dotdot);
if (rc == 0)
*attr |= LUDA_REPAIR;
else
ent->oied_namelen, ent->oied_name,
PFID(fid), rc);
}
- } else if (rc == -ENODATA) {
+ } else {
/* Do not repair under dryrun mode. */
if (*attr & LUDA_VERIFY_DRYRUN) {
if (fid_is_sane(fid)) {
inode->i_generation);
*attr |= LUDA_UPGRADE;
}
- GOTO(out_inode, rc = 0);
+
+ GOTO(out, rc = 0);
}
- if (dev->od_dirent_journal == 0) {
- iput(inode);
+ if (jh == NULL) {
brelse(bh);
- if (hlock != NULL)
+ dev->od_dirent_journal = 1;
+ if (hlock != NULL) {
ldiskfs_htree_unlock(hlock);
- else
+ hlock = NULL;
+ } else {
up_read(&obj->oo_ext_idx_sem);
- dev->od_dirent_journal = 1;
+ }
+
goto again;
}
lu_igif_build(fid, inode->i_ino, inode->i_generation);
/* It is probably IGIF object. Only aappend the
* FID-in-dirent. OI scrub will process FID-in-LMA. */
- rc = osd_dirent_reinsert(env, jh, dir, inode, ent,
- fid, bh, de, hlock);
+ rc = osd_dirent_reinsert(env, jh, dentry, fid, bh, de,
+ hlock, dot_dotdot);
if (rc == 0)
*attr |= LUDA_UPGRADE;
else
}
}
- GOTO(out_inode, rc);
-
-out_inode:
- iput(inode);
+ GOTO(out, rc);
-out_journal:
+out:
brelse(bh);
if (hlock != NULL) {
ldiskfs_htree_unlock(hlock);
else
up_read(&obj->oo_ext_idx_sem);
}
+
if (jh != NULL)
ldiskfs_journal_stop(jh);
+
+out_inode:
+ iput(inode);
if (rc >= 0 && !dirty)
dev->od_dirent_journal = 0;
+
return rc;
}
rc = osd_dirent_check_repair(env, obj, it, fid, id,
&attr);
}
+
+ if (!fid_is_sane(fid)) {
+ attr &= ~LUDA_IGNORE;
+ attr |= LUDA_UNKNOWN;
+ }
} else {
attr &= ~LU_DIRENT_ATTRS_MASK;
if (!fid_is_sane(fid)) {
if (osd_remote_fid(env, dev, fid))
RETURN(0);
- if (likely(!(attr & LUDA_IGNORE) && rc == 0))
+ if (likely(!(attr & (LUDA_IGNORE | LUDA_UNKNOWN)) && rc == 0))
osd_add_oi_cache(oti, dev, id, fid);
RETURN(rc > 0 ? 0 : rc);
struct lu_context_key *key, void* data)
{
struct osd_thread_info *info = data;
+ struct ldiskfs_inode_info *lli = LDISKFS_I(info->oti_inode);
+ struct osd_idmap_cache *idc = info->oti_ins_cache;
if (info->oti_inode != NULL)
- OBD_FREE_PTR(info->oti_inode);
+ OBD_FREE_PTR(lli);
if (info->oti_hlock != NULL)
ldiskfs_htree_lock_free(info->oti_hlock);
OBD_FREE(info->oti_it_ea_buf, OSD_IT_EA_BUFSIZE);
lu_buf_free(&info->oti_iobuf.dr_pg_buf);
lu_buf_free(&info->oti_iobuf.dr_bl_buf);
lu_buf_free(&info->oti_big_buf);
+ if (idc != NULL) {
+ LASSERT(info->oti_ins_cache_size > 0);
+ OBD_FREE(idc, sizeof(*idc) * info->oti_ins_cache_size);
+ info->oti_ins_cache = NULL;
+ info->oti_ins_cache_size = 0;
+ }
OBD_FREE_PTR(info);
}
.o_health_check = osd_health_check,
};
-static int __init osd_mod_init(void)
+static int __init osd_init(void)
{
int rc;
return rc;
}
-static void __exit osd_mod_exit(void)
+static void __exit osd_exit(void)
{
class_unregister_type(LUSTRE_OSD_LDISKFS_NAME);
lu_kmem_fini(ldiskfs_caches);
}
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
MODULE_DESCRIPTION("Lustre Object Storage Device ("LUSTRE_OSD_LDISKFS_NAME")");
MODULE_VERSION(LUSTRE_VERSION_STRING);
MODULE_LICENSE("GPL");
-module_init(osd_mod_init);
-module_exit(osd_mod_exit);
+module_init(osd_init);
+module_exit(osd_exit);