X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_handler.c;h=60855dfb97e388561a6b80ac268a836dc46fedf1;hp=214bce719b1a9a7c6e2d1add91849517ae276da1;hb=a079ade7913b923b795ea5c01df4e69bf1a87691;hpb=0887b89c0c4e2b7c5a7ba3365e758a7d94c667fa diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 214bce7..60855df 100644 --- a/lustre/osd-ldiskfs/osd_handler.c +++ b/lustre/osd-ldiskfs/osd_handler.c @@ -27,7 +27,7 @@ * 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/ @@ -60,6 +60,7 @@ #include #include +#include #undef ENTRY /* * struct OBD_{ALLOC,FREE}*() @@ -82,12 +83,12 @@ #include int ldiskfs_pdo = 1; -CFS_MODULE_PARM(ldiskfs_pdo, "i", int, 0644, - "ldiskfs with parallel directory operations"); +module_param(ldiskfs_pdo, int, 0644); +MODULE_PARM_DESC(ldiskfs_pdo, "ldiskfs with parallel directory operations"); int ldiskfs_track_declares_assert; -CFS_MODULE_PARM(ldiskfs_track_declares_assert, "i", int, 0644, - "LBUG during tracking of declares"); +module_param(ldiskfs_track_declares_assert, int, 0644); +MODULE_PARM_DESC(ldiskfs_track_declares_assert, "LBUG during tracking of declares"); /* Slab to allocate dynlocks */ struct kmem_cache *dynlock_cachep; @@ -175,6 +176,153 @@ static int osd_root_get(const struct lu_env *env, } /* + * 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. */ @@ -270,6 +418,7 @@ struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev, 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); @@ -284,6 +433,53 @@ struct inode *osd_iget(struct osd_thread_info *info, struct osd_device *dev, 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) @@ -311,6 +507,132 @@ osd_iget_fid(struct osd_thread_info *info, struct osd_device *dev, return inode; } +static struct inode *osd_iget_check(struct osd_thread_info *info, + struct osd_device *dev, + const struct lu_fid *fid, + struct osd_inode_id *id, + bool cached) +{ + struct inode *inode; + int rc = 0; + ENTRY; + + /* The cached OI mapping is trustable. If we cannot locate the inode + * via the cached OI mapping, then return the failure to the caller + * directly without further OI checking. */ + + inode = ldiskfs_iget(osd_sb(dev), id->oii_ino); + if (IS_ERR(inode)) { + rc = PTR_ERR(inode); + if (cached || (rc != -ENOENT && rc != -ESTALE)) { + CDEBUG(D_INODE, "no inode: ino = %u, rc = %d\n", + id->oii_ino, rc); + + GOTO(put, rc); + } + + goto check_oi; + } + + if (is_bad_inode(inode)) { + rc = -ENOENT; + if (cached) { + CDEBUG(D_INODE, "bad inode: ino = %u\n", id->oii_ino); + + GOTO(put, rc); + } + + goto check_oi; + } + + if (id->oii_gen != OSD_OII_NOGEN && + inode->i_generation != id->oii_gen) { + rc = -ESTALE; + if (cached) { + CDEBUG(D_INODE, "unmatched inode: ino = %u, " + "oii_gen = %u, i_generation = %u\n", + id->oii_ino, id->oii_gen, inode->i_generation); + + GOTO(put, rc); + } + + goto check_oi; + } + + if (inode->i_nlink == 0) { + rc = -ENOENT; + if (cached) { + CDEBUG(D_INODE, "stale inode: ino = %u\n", id->oii_ino); + + GOTO(put, rc); + } + + 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 = osd_oi_lookup(info, dev, fid, id, OI_CHECK_FLD); + /* XXX: There are four possible cases: + * 1. rc = 0. + * Backup/restore caused the OI invalid. + * 2. rc = 0. + * Someone unlinked the object but NOT removed + * the OI mapping, such as mount target device + * as ldiskfs, and modify something directly. + * 3. rc = -ENOENT. + * Someone just removed the object between the + * former oi_lookup and the iget. It is normal. + * 4. Other failure cases. + * + * Generally, when the device is mounted, it will + * auto check whether the system is restored from + * file-level backup or not. We trust such detect + * to distinguish the 1st case from the 2nd case. */ + if (rc == 0) { + if (!IS_ERR(inode) && inode->i_generation != 0 && + inode->i_generation == id->oii_gen) + /* "id->oii_gen != OSD_OII_NOGEN" is for + * "@cached == false" case. */ + rc = -ENOENT; + else + rc = -EREMCHG; + } else { + /* If the OI mapping was in OI file before the + * osd_iget_check(), but now, it is disappear, + * then it must be removed by race. That is a + * normal race case. */ + } + } else { + if (id->oii_gen == OSD_OII_NOGEN) + osd_id_gen(id, inode->i_ino, inode->i_generation); + + /* Do not update file c/mtime in ldiskfs. + * NB: we don't have any lock to protect this because we don't + * have reference on osd_object now, but contention with + * another lookup + attr_set can't happen in the tiny window + * between if (...) and set S_NOCMTIME. */ + if (!(inode->i_flags & S_NOCMTIME)) + inode->i_flags |= S_NOCMTIME; + } + + GOTO(put, rc); + +put: + if (rc != 0) { + if (!IS_ERR(inode)) + iput(inode); + + inode = ERR_PTR(rc); + } + + return inode; +} + /** * \retval +v: new filter_fid, does not contain self-fid * \retval 0: filter_fid_old, contains self-fid @@ -328,7 +650,8 @@ int osd_get_idif(struct osd_thread_info *info, struct inode *inode, 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; @@ -395,9 +718,6 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj) } } - if (unlikely(rc == -ENODATA)) - RETURN(0); - if (rc < 0) RETURN(rc); @@ -459,10 +779,9 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, struct osd_scrub *scrub; struct scrub_file *sf; int result; - int saved = 0; - bool in_oi = false; - bool in_cache = false; - bool triggered = false; + int rc1 = 0; + bool cached = true; + bool remote = false; ENTRY; LINVRNT(osd_invariant(obj)); @@ -476,7 +795,7 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, 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 @@ -491,7 +810,6 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, if (lu_fid_eq(fid, &oic->oic_fid) && likely(oic->oic_dev == dev)) { id = &oic->oic_lid; - in_cache = true; goto iget; } @@ -503,10 +821,12 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, goto iget; } + cached = false; /* Search order: 3. OI files. */ result = osd_oi_lookup(info, dev, fid, id, OI_CHECK_FLD); if (result == -ENOENT) { if (!(fid_is_norm(fid) || fid_is_igif(fid)) || + fid_is_on_ost(info, dev, fid, OI_CHECK_FLD) || !ldiskfs_test_bit(osd_oi_fid2idx(dev,fid), sf->sf_oi_bitmap)) GOTO(out, result = 0); @@ -517,81 +837,79 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, if (result != 0) GOTO(out, result); - in_oi = true; - iget: - inode = osd_iget(info, dev, id); + inode = osd_iget_check(info, dev, fid, id, cached); if (IS_ERR(inode)) { result = PTR_ERR(inode); - if (result != -ENOENT && result != -ESTALE) - GOTO(out, result); - - if (in_cache) - fid_zero(&oic->oic_fid); - - result = osd_oi_lookup(info, dev, fid, id, OI_CHECK_FLD); - if (result != 0) - GOTO(out, result = (result == -ENOENT ? 0 : result)); + if (result == -ENOENT || result == -ESTALE) + GOTO(out, result = -ENOENT); - /* The OI mapping is there, but the inode is NOT there. - * Two possible cases for that: - * - * 1) Backup/restore caused the OI invalid. - * 2) Someone unlinked the object but NOT removed - * the OI mapping, such as mount target device - * as ldiskfs, and modify something directly. - * - * Generally, when the device is mounted, it will - * auto check whether the system is restored from - * file-level backup or not. We trust such detect - * to distinguish the 1st case from the 2nd case. */ - if (!(scrub->os_file.sf_flags & SF_INCONSISTENT)) - GOTO(out, result = 0); + if (result == -EREMCHG) { trigger: - if (unlikely(triggered)) - GOTO(out, result = saved); - - triggered = true; - if (thread_is_running(&scrub->os_thread)) { - result = -EINPROGRESS; - } else if (!dev->od_noscrub) { - /* Since we do not know the right OI mapping, we have - * to trigger OI scrub to scan the whole device. */ - result = osd_scrub_start(dev, SS_AUTO_FULL | - SS_CLEAR_DRYRUN | SS_CLEAR_FAILOUT); - CDEBUG(D_LFSCK | D_CONSOLE, "%.16s: trigger OI " - "scrub by RPC for "DFID", rc = %d [1]\n", - osd_name(dev), PFID(fid), result); - if (result == 0 || result == -EALREADY) - result = -EINPROGRESS; - else - result = -EREMCHG; - } + /* We still have chance to get the valid inode: for the + * object which is referenced by remote name entry, the + * object on the local MDT will be linked under the dir + * of "/REMOTE_PARENT_DIR" with its FID string as name. + * + * We do not know whether the object for the given FID + * is referenced by some remote name entry or not, and + * especially for DNE II, a multiple-linked object may + * have many name entries reside on many MDTs. + * + * To simplify the operation, OSD will not distinguish + * more, just lookup "/REMOTE_PARENT_DIR". Usually, it + * only happened for the RPC from other MDT during the + * OI scrub, or for the client side RPC with FID only, + * such as FID to path, or from old connected client. */ + if (!remote && + !fid_is_on_ost(info, dev, fid, OI_CHECK_FLD)) { + rc1 = osd_lookup_in_remote_parent(info, dev, + fid, id); + if (rc1 == 0) { + remote = true; + cached = true; + goto iget; + } + } - /* We still have chance to get the valid inode: for the - * object which is referenced by remote name entry, the - * object on the local MDT will be linked under the dir - * of "/REMOTE_PARENT_DIR" with its FID string as name. - * - * We do not know whether the object for the given FID - * is referenced by some remote name entry or not, and - * especially for DNE II, a multiple-linked object may - * have many name entries reside on many MDTs. - * - * To simplify the operation, OSD will not distinguish - * more, just lookup "/REMOTE_PARENT_DIR". Usually, it - * only happened for the RPC from other MDT during the - * OI scrub, or for the client side RPC with FID only, - * such as FID to path, or from old connected client. */ - saved = result; - result = osd_lookup_in_remote_parent(info, dev, fid, id); - if (result == 0) { - in_oi = false; - goto iget; + if (thread_is_running(&scrub->os_thread)) { + if (remote) { + osd_add_oi_cache(info, dev, id, fid); + osd_oii_insert(dev, oic, true); + } else { + result = -EINPROGRESS; + } + } else if (!dev->od_noscrub) { + __u32 flags = SS_CLEAR_DRYRUN | + SS_CLEAR_FAILOUT; + + flags |= (remote ? SS_AUTO_PARTIAL : + SS_AUTO_FULL); + rc1 = osd_scrub_start(dev, flags); + LCONSOLE_WARN("%.16s: trigger OI scrub by RPC " + "for the "DFID" with flags 0x%x," + " rc = %d\n", osd_name(dev), + PFID(fid), flags, rc1); + if (rc1 == 0 || rc1 == -EALREADY) { + result = -EINPROGRESS; + if (remote) { + osd_add_oi_cache(info, dev, id, + fid); + osd_oii_insert(dev, oic, true); + } + } else { + result = -EREMCHG; + } + } else { + result = -EREMCHG; + } } - GOTO(out, result = saved); + GOTO(out, result); + } else if (remote) { + result = 0; + goto trigger; } obj->oo_inode = inode; @@ -599,34 +917,66 @@ trigger: result = osd_check_lma(env, obj); if (result != 0) { + if (result == -ENODATA) { + if (cached) { + result = osd_oi_lookup(info, dev, fid, id, + OI_CHECK_FLD); + if (result != 0) { + /* result == -ENOENT means that the OI + * mapping has been removed by race, + * the target inode belongs to other + * object. + * + * Others error also can be returned + * directly. */ + iput(inode); + obj->oo_inode = NULL; + GOTO(out, result); + } else { + /* result == 0 means the cached OI + * mapping is still in the OI file, + * the target the inode is valid. */ + } + } else { + /* The current OI mapping is from the OI file, + * since the inode has been found via + * osd_iget_check(), no need recheck OI. */ + } + + goto found; + } + iput(inode); obj->oo_inode = NULL; - if (result != -EREMCHG) GOTO(out, result); - if (in_cache) - fid_zero(&oic->oic_fid); - - result = osd_oi_lookup(info, dev, fid, id, OI_CHECK_FLD); - if (result == 0) - goto trigger; - - if (result != -ENOENT) - GOTO(out, result); + if (cached) { + result = osd_oi_lookup(info, dev, fid, id, + OI_CHECK_FLD); + /* result == -ENOENT means the cached OI mapping + * has been removed from the OI file by race, + * above target inode belongs to other object. + * + * Others error also can be returned directly. */ + if (result != 0) + GOTO(out, result); - if (!in_oi && (fid_is_norm(fid) || fid_is_igif(fid)) && - ldiskfs_test_bit(osd_oi_fid2idx(dev, fid), - sf->sf_oi_bitmap)) - goto trigger; + /* result == 0, goto trigger */ + } else { + /* The current OI mapping is from the OI file, + * since the inode has been found via + * osd_iget_check(), no need recheck OI. */ + } - GOTO(out, result = 0); + goto trigger; } +found: obj->oo_compat_dot_created = 1; obj->oo_compat_dotdot_created = 1; - if (!S_ISDIR(inode->i_mode) || !ldiskfs_pdo) /* done */ + if (!S_ISDIR(inode->i_mode) || !ldiskfs_pdo) /* done */ GOTO(out, result = 0); LASSERT(obj->oo_hl_head == NULL); @@ -639,6 +989,9 @@ trigger: GOTO(out, result = 0); out: + if (result != 0 && cached) + fid_zero(&oic->oic_fid); + LINVRNT(osd_invariant(obj)); return result; } @@ -674,8 +1027,22 @@ static int osd_object_init(const struct lu_env *env, struct lu_object *l, result = osd_fid_lookup(env, obj, lu_object_fid(l), conf); obj->oo_dt.do_body_ops = &osd_body_ops_new; - if (result == 0 && obj->oo_inode != NULL) + if (result == 0 && obj->oo_inode != NULL) { + struct osd_thread_info *oti = osd_oti_get(env); + struct lustre_mdt_attrs *lma = &oti->oti_mdt_attrs; + osd_object_init0(obj); + result = osd_get_lma(oti, obj->oo_inode, + &oti->oti_obj_dentry, lma); + if (result == 0) { + /* Convert LMAI flags to lustre LMA flags + * and cache it to oo_lma_flags */ + obj->oo_lma_flags = + lma_to_lustre_flags(lma->lma_incompat); + } else if (result == -ENODATA) { + result = 0; + } + } LINVRNT(osd_invariant(obj)); return result; @@ -859,6 +1226,11 @@ static void osd_trans_commit_cb(struct super_block *sb, OBD_FREE_PTR(oh); } +#ifndef HAVE_SB_START_WRITE +# define sb_start_write(sb) do {} while (0) +# define sb_end_write(sb) do {} while (0) +#endif + static struct thandle *osd_trans_create(const struct lu_env *env, struct dt_device *d) { @@ -871,7 +1243,8 @@ static struct thandle *osd_trans_create(const struct lu_env *env, /* on pending IO in this thread should left from prev. request */ LASSERT(atomic_read(&iobuf->dr_numreqs) == 0); - th = ERR_PTR(-ENOMEM); + sb_start_write(osd_sb(osd_dt_dev(d))); + OBD_ALLOC_GFP(oh, sizeof *oh, GFP_NOFS); if (oh != NULL) { oh->ot_quota_trans = &oti->oti_quota_trans; @@ -891,6 +1264,9 @@ static struct thandle *osd_trans_create(const struct lu_env *env, sizeof(oti->oti_declare_ops_cred)); memset(oti->oti_declare_ops_used, 0, sizeof(oti->oti_declare_ops_used)); + } else { + sb_end_write(osd_sb(osd_dt_dev(d))); + th = ERR_PTR(-ENOMEM); } RETURN(th); } @@ -971,16 +1347,13 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d, static unsigned long last_printed; static int last_credits; - CWARN("%.16s: too many transaction credits (%d > %d)\n", - LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, - oh->ot_credits, - osd_journal(dev)->j_max_transaction_buffers); - - osd_trans_dump_creds(env, th); - + /* don't make noise on a tiny testing systems + * actual credits misuse will be caught anyway */ if (last_credits != oh->ot_credits && time_after(jiffies, last_printed + - msecs_to_jiffies(60 * MSEC_PER_SEC))) { + msecs_to_jiffies(60 * MSEC_PER_SEC)) && + osd_transaction_size(dev) > 512) { + osd_trans_dump_creds(env, th); libcfs_debug_dumpstack(NULL); last_credits = oh->ot_credits; last_printed = jiffies; @@ -1073,6 +1446,9 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, 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; @@ -1132,6 +1508,8 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, if (unlikely(remove_agents != 0)) osd_process_scheduled_agent_removals(env, osd); + sb_end_write(osd_sb(osd)); + RETURN(rc); } @@ -1197,6 +1575,12 @@ static void osd_object_delete(const struct lu_env *env, struct lu_object *l) static void osd_object_release(const struct lu_env *env, struct lu_object *l) { + struct osd_object *o = osd_obj(l); + /* nobody should be releasing a non-destroyed object with nlink=0 + * the API allows this, but ldiskfs doesn't like and then report + * this inode as deleted */ + if (unlikely(!o->oo_destroyed && o->oo_inode && o->oo_inode->i_nlink == 0)) + LBUG(); } /* @@ -1220,18 +1604,17 @@ static int osd_object_print(const struct lu_env *env, void *cookie, d ? d->id_ops->id_name : "plain"); } -#define GRANT_FOR_LOCAL_OIDS 32 /* 128kB for last_rcvd, quota files, ... */ - /* * Concurrency: shouldn't matter. */ int osd_statfs(const struct lu_env *env, struct dt_device *d, struct obd_statfs *sfs) { - struct osd_device *osd = osd_dt_dev(d); - struct super_block *sb = osd_sb(osd); - struct kstatfs *ksfs; - int result = 0; + struct osd_device *osd = osd_dt_dev(d); + struct super_block *sb = osd_sb(osd); + struct kstatfs *ksfs; + __u64 reserved; + int result = 0; if (unlikely(osd->od_mnt == NULL)) return -EINPROGRESS; @@ -1245,34 +1628,40 @@ int osd_statfs(const struct lu_env *env, struct dt_device *d, ksfs = &osd_oti_get(env)->oti_ksfs; } - spin_lock(&osd->od_osfs_lock); result = sb->s_op->statfs(sb->s_root, ksfs); - if (likely(result == 0)) { /* N.B. statfs can't really fail */ - statfs_pack(sfs, ksfs); - if (unlikely(sb->s_flags & MS_RDONLY)) - sfs->os_state = OS_STATE_READONLY; - if (LDISKFS_HAS_INCOMPAT_FEATURE(sb, - LDISKFS_FEATURE_INCOMPAT_EXTENTS)) - sfs->os_maxbytes = sb->s_maxbytes; - else - sfs->os_maxbytes = LDISKFS_SB(sb)->s_bitmap_maxbytes; - } - spin_unlock(&osd->od_osfs_lock); + if (result) + goto out; + + statfs_pack(sfs, ksfs); + if (unlikely(sb->s_flags & MS_RDONLY)) + sfs->os_state = OS_STATE_READONLY; + if (LDISKFS_HAS_INCOMPAT_FEATURE(sb, + LDISKFS_FEATURE_INCOMPAT_EXTENTS)) + sfs->os_maxbytes = sb->s_maxbytes; + else + sfs->os_maxbytes = LDISKFS_SB(sb)->s_bitmap_maxbytes; - if (unlikely(env == NULL)) - OBD_FREE_PTR(ksfs); + /* + * Reserve some space so to avoid fragmenting the filesystem too much. + * Fragmentation not only impacts performance, but can also increase + * metadata overhead significantly, causing grant calculation to be + * wrong. + * + * Reserve 0.78% of total space, at least 8MB for small filesystems. + */ + CLASSERT(OSD_STATFS_RESERVED > LDISKFS_MAX_BLOCK_SIZE); + reserved = OSD_STATFS_RESERVED >> sb->s_blocksize_bits; + if (likely(sfs->os_blocks >= reserved << OSD_STATFS_RESERVED_SHIFT)) + reserved = sfs->os_blocks >> OSD_STATFS_RESERVED_SHIFT; - /* Reserve a small amount of space for local objects like last_rcvd, - * llog, quota files, ... */ - if (sfs->os_bavail <= GRANT_FOR_LOCAL_OIDS) { - sfs->os_bavail = 0; - } else { - sfs->os_bavail -= GRANT_FOR_LOCAL_OIDS; - /** Take out metadata overhead for indirect blocks */ - sfs->os_bavail -= sfs->os_bavail >> (sb->s_blocksize_bits - 3); - } + sfs->os_blocks -= reserved; + sfs->os_bfree -= min(reserved, sfs->os_bfree); + sfs->os_bavail -= min(reserved, sfs->os_bavail); - return result; +out: + if (unlikely(env == NULL)) + OBD_FREE_PTR(ksfs); + return result; } /** @@ -1301,21 +1690,23 @@ static void osd_conf_get(const struct lu_env *env, */ param->ddp_max_name_len = LDISKFS_NAME_LEN; param->ddp_max_nlink = LDISKFS_LINK_MAX; - param->ddp_block_shift = sb->s_blocksize_bits; + param->ddp_symlink_max = sb->s_blocksize; param->ddp_mount_type = LDD_MT_LDISKFS; if (LDISKFS_HAS_INCOMPAT_FEATURE(sb, LDISKFS_FEATURE_INCOMPAT_EXTENTS)) param->ddp_maxbytes = sb->s_maxbytes; else param->ddp_maxbytes = LDISKFS_SB(sb)->s_bitmap_maxbytes; - /* Overhead estimate should be fairly accurate, so we really take a tiny - * error margin which also avoids fragmenting the filesystem too much */ - param->ddp_grant_reserved = 2; /* end up to be 1.9% after conversion */ /* inode are statically allocated, so per-inode space consumption * is the space consumed by the directory entry */ param->ddp_inodespace = PER_OBJ_USAGE; - /* per-fragment overhead to be used by the client code */ - param->ddp_grant_frag = 6 * LDISKFS_BLOCK_SIZE(sb); - param->ddp_mntopts = 0; + /* EXT_INIT_MAX_LEN is the theoretical maximum extent size (32k blocks + * = 128MB) which is unlikely to be hit in real life. Report a smaller + * maximum length to not under count the actual number of extents + * needed for writing a file. */ + param->ddp_max_extent_blks = EXT_INIT_MAX_LEN >> 2; + /* worst-case extent insertion metadata overhead */ + param->ddp_extent_tax = 6 * LDISKFS_BLOCK_SIZE(sb); + param->ddp_mntopts = 0; if (test_opt(sb, XATTR_USER)) param->ddp_mntopts |= MNTOPT_USERXATTR; if (test_opt(sb, POSIX_ACL)) @@ -1394,6 +1785,12 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d) #ifdef HAVE_DEV_SET_RDONLY CERROR("*** setting %s read-only ***\n", osd_dt_dev(d)->od_svname); + if (sb->s_op->freeze_fs) { + rc = sb->s_op->freeze_fs(sb); + if (rc) + goto out; + } + if (jdev && (jdev != dev)) { CDEBUG(D_IOCTL | D_HA, "set journal dev %lx rdonly\n", (long)jdev); @@ -1401,10 +1798,16 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d) } CDEBUG(D_IOCTL | D_HA, "set dev %lx rdonly\n", (long)dev); dev_set_rdonly(dev); -#else - CERROR("%s: %lx CANNOT BE SET READONLY: rc = %d\n", - osd_dt_dev(d)->od_svname, (long)dev, rc); + + if (sb->s_op->unfreeze_fs) + sb->s_op->unfreeze_fs(sb); + +out: #endif + if (rc) + CERROR("%s: %lx CANNOT BE SET READONLY: rc = %d\n", + osd_dt_dev(d)->od_svname, (long)dev, rc); + RETURN(rc); } @@ -1560,7 +1963,6 @@ static struct timespec *osd_inode_time(const struct lu_env *env, return t; } - static void osd_inode_getattr(const struct lu_env *env, struct inode *inode, struct lu_attr *attr) { @@ -1577,7 +1979,7 @@ static void osd_inode_getattr(const struct lu_env *env, attr->la_blocks = inode->i_blocks; attr->la_uid = i_uid_read(inode); attr->la_gid = i_gid_read(inode); - attr->la_flags = LDISKFS_I(inode)->i_flags; + attr->la_flags = ll_inode_to_ext_flags(inode->i_flags); attr->la_nlink = inode->i_nlink; attr->la_rdev = inode->i_rdev; attr->la_blksize = 1 << inode->i_blkbits; @@ -1590,7 +1992,9 @@ static int osd_attr_get(const struct lu_env *env, { struct osd_object *obj = osd_dt_obj(dt); - if (!dt_object_exists(dt)) + if (unlikely(!dt_object_exists(dt))) + return -ENOENT; + if (unlikely(obj->oo_destroyed)) return -ENOENT; LASSERT(!dt_object_remote(dt)); @@ -1598,7 +2002,10 @@ static int osd_attr_get(const struct lu_env *env, spin_lock(&obj->oo_guard); osd_inode_getattr(env, obj->oo_inode, attr); + if (obj->oo_lma_flags & LUSTRE_ORPHAN_FL) + attr->la_flags |= LUSTRE_ORPHAN_FL; spin_unlock(&obj->oo_guard); + return 0; } @@ -1630,6 +2037,9 @@ static int osd_declare_attr_set(const struct lu_env *env, osd_trans_declare_op(env, oh, OSD_OT_ATTR_SET, osd_dto_credits_noquota[DTO_ATTR_SET_BASE]); + osd_trans_declare_op(env, oh, OSD_OT_XATTR_SET, + osd_dto_credits_noquota[DTO_XATTR_SET]); + if (attr == NULL || obj->oo_inode == NULL) RETURN(rc); @@ -1874,10 +2284,41 @@ static int osd_attr_set(const struct lu_env *env, spin_lock(&obj->oo_guard); rc = osd_inode_setattr(env, inode, attr); spin_unlock(&obj->oo_guard); + if (rc != 0) + GOTO(out, rc); - if (!rc) - ll_dirty_inode(inode, I_DIRTY_DATASYNC); + ll_dirty_inode(inode, I_DIRTY_DATASYNC); + + if (!(attr->la_valid & LA_FLAGS)) + GOTO(out, rc); + /* Let's check if there are extra flags need to be set into LMA */ + if (attr->la_flags & LUSTRE_LMA_FL_MASKS) { + struct osd_thread_info *info = osd_oti_get(env); + struct lustre_mdt_attrs *lma = &info->oti_mdt_attrs; + + rc = osd_get_lma(info, inode, &info->oti_obj_dentry, lma); + if (rc != 0) + GOTO(out, rc); + + lma->lma_incompat |= + lustre_to_lma_flags(attr->la_flags); + lustre_lma_swab(lma); + rc = __osd_xattr_set(info, inode, XATTR_NAME_LMA, + lma, sizeof(*lma), XATTR_REPLACE); + if (rc != 0) { + struct osd_device *osd = osd_obj2dev(obj); + + CWARN("%s: set "DFID" lma flags %u failed: rc = %d\n", + osd_name(osd), PFID(lu_object_fid(&dt->do_lu)), + lma->lma_incompat, rc); + } else { + obj->oo_lma_flags = + attr->la_flags & LUSTRE_LMA_FL_MASKS; + } + osd_trans_exec_check(env, handle, OSD_OT_XATTR_SET); + } +out: osd_trans_exec_check(env, handle, OSD_OT_ATTR_SET); return rc; @@ -2095,6 +2536,12 @@ static void osd_ah_init(const struct lu_env *env, struct dt_allocation_hint *ah, 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, @@ -2119,20 +2566,20 @@ static void osd_attr_init(struct osd_thread_info *info, struct osd_object *obj, if (result) return; - if (attr->la_valid != 0) { - result = osd_inode_setattr(info->oti_env, inode, attr); - /* - * The osd_inode_setattr() should always succeed here. The - * only error that could be returned is EDQUOT when we are - * trying to change the UID or GID of the inode. However, this - * should not happen since quota enforcement is no longer - * enabled on ldiskfs (lquota takes care of it). - */ + if (attr->la_valid != 0) { + result = osd_inode_setattr(info->oti_env, inode, attr); + /* + * The osd_inode_setattr() should always succeed here. The + * only error that could be returned is EDQUOT when we are + * trying to change the UID or GID of the inode. However, this + * should not happen since quota enforcement is no longer + * enabled on ldiskfs (lquota takes care of it). + */ LASSERTF(result == 0, "%d\n", result); ll_dirty_inode(inode, I_DIRTY_DATASYNC); - } + } - attr->la_valid = valid; + attr->la_valid = valid; } /** @@ -2199,7 +2646,8 @@ static int __osd_oi_insert(const struct lu_env *env, struct osd_object *obj, osd_trans_exec_op(env, th, OSD_OT_INSERT); osd_id_gen(id, obj->oo_inode->i_ino, obj->oo_inode->i_generation); - rc = osd_oi_insert(info, osd, fid, id, oh->ot_handle, OI_CHECK_FLD); + rc = osd_oi_insert(info, osd, fid, id, oh->ot_handle, + OI_CHECK_FLD, NULL); osd_trans_exec_check(env, th, OSD_OT_INSERT); return rc; @@ -2270,6 +2718,10 @@ static int osd_declare_object_create(const struct lu_env *env, 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); } @@ -2325,9 +2777,11 @@ static int osd_declare_object_destroy(const struct lu_env *env, 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]); @@ -2343,6 +2797,13 @@ static int osd_declare_object_destroy(const struct lu_env *env, /* 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); } @@ -2384,6 +2845,7 @@ static int osd_object_destroy(const struct lu_env *env, 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); @@ -2508,6 +2970,8 @@ static int osd_add_dot_dotdot_internal(struct osd_thread_info *info, { 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); @@ -2515,8 +2979,23 @@ static int osd_add_dot_dotdot_internal(struct osd_thread_info *info, 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; } /** @@ -2672,7 +3151,7 @@ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt, 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; @@ -2698,13 +3177,15 @@ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt, 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; @@ -2713,6 +3194,15 @@ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt, 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)); @@ -2748,7 +3238,7 @@ static int osd_object_ref_add(const struct lu_env *env, struct osd_thandle *oh; int rc = 0; - if (!dt_object_exists(dt)) + if (!dt_object_exists(dt) || obj->oo_destroyed) return -ENOENT; LINVRNT(osd_invariant(obj)); @@ -2799,6 +3289,9 @@ static int osd_declare_object_ref_del(const struct lu_env *env, { struct osd_thandle *oh; + if (!dt_object_exists(dt)) + return -ENOENT; + LASSERT(!dt_object_remote(dt)); LASSERT(handle != NULL); @@ -2942,9 +3435,29 @@ static int osd_declare_xattr_set(const struct lu_env *env, } 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 @@ -3211,7 +3724,7 @@ static int osd_index_try(const struct lu_env *env, struct dt_object *dt, 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; @@ -3438,7 +3951,8 @@ static int osd_index_declare_ea_delete(const struct lu_env *env, 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); @@ -3784,7 +4298,8 @@ static int __osd_ea_add_rec(struct osd_thread_info *info, 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; @@ -3843,7 +4358,7 @@ static int osd_add_dot_dotdot(struct osd_thread_info *info, 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; } @@ -3931,7 +4446,7 @@ static int osd_ea_add_rec(const struct lu_env *env, struct osd_object *pobj, return rc; } -static void +static int osd_consistency_check(struct osd_thread_info *oti, struct osd_device *dev, struct osd_idmap_cache *oic) { @@ -3943,19 +4458,39 @@ osd_consistency_check(struct osd_thread_info *oti, struct osd_device *dev, 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. @@ -3965,7 +4500,7 @@ again: if (unlikely(rc == -EAGAIN)) goto again; - RETURN_EXIT; + RETURN(0); } if (!dev->od_noscrub && ++once == 1) { @@ -3979,7 +4514,7 @@ again: goto again; } - EXIT; + RETURN(0); } static int osd_fail_fid_lookup(struct osd_thread_info *oti, @@ -4165,16 +4700,16 @@ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj, 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; } @@ -4190,65 +4725,6 @@ out: } /** - * 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 @@ -4267,28 +4743,34 @@ static int osd_index_declare_ea_insert(const struct lu_env *env, { 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); @@ -4329,9 +4811,8 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, 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; @@ -4346,14 +4827,22 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, 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; @@ -4379,15 +4868,23 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, } } 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 = igrab(child->oo_inode); + 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->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); @@ -4395,9 +4892,8 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, 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); @@ -4813,11 +5309,17 @@ struct osd_filldir_cbs { * \retval 0 on success * \retval 1 on buffer full */ +#ifdef HAVE_FILLDIR_USE_CTX +static int osd_ldiskfs_filldir(struct dir_context *buf, + const char *name, int namelen, +#else static int osd_ldiskfs_filldir(void *buf, const char *name, int namelen, +#endif loff_t offset, __u64 ino, unsigned d_type) { - struct osd_it_ea *it = ((struct osd_filldir_cbs *)buf)->it; + struct osd_it_ea *it = + ((struct osd_filldir_cbs *)buf)->it; struct osd_object *obj = it->oie_obj; struct osd_it_ea_dirent *ent = it->oie_dirent; struct lu_fid *fid = &ent->oied_fid; @@ -4993,63 +5495,46 @@ static int osd_it_ea_key_size(const struct lu_env *env, const struct dt_it *di) 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, @@ -5057,42 +5542,41 @@ osd_dirent_reinsert(const struct lu_env *env, handle_t *jh, 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); } @@ -5122,6 +5606,32 @@ osd_dirent_check_repair(const struct lu_env *env, struct osd_object *obj, 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; @@ -5129,9 +5639,6 @@ osd_dirent_check_repair(const struct lu_env *env, struct osd_object *obj, 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. * @@ -5148,8 +5655,9 @@ osd_dirent_check_repair(const struct lu_env *env, struct osd_object *obj, 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); @@ -5158,7 +5666,8 @@ again: "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) { @@ -5188,35 +5697,18 @@ again: * 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 || @@ -5229,39 +5721,42 @@ again: 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 @@ -5276,25 +5771,28 @@ again: 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 @@ -5305,7 +5803,7 @@ again: 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)) { @@ -5315,17 +5813,20 @@ again: 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; } @@ -5347,8 +5848,8 @@ 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 @@ -5361,12 +5862,9 @@ again: } } - GOTO(out_inode, rc); - -out_inode: - iput(inode); + GOTO(out, rc); -out_journal: +out: brelse(bh); if (hlock != NULL) { ldiskfs_htree_unlock(hlock); @@ -5376,10 +5874,15 @@ out_journal: 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; } @@ -5425,6 +5928,11 @@ static inline int osd_it_ea_rec(const struct lu_env *env, 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)) { @@ -5462,7 +5970,7 @@ static inline int osd_it_ea_rec(const struct lu_env *env, 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); @@ -5615,15 +6123,23 @@ static void osd_key_fini(const struct lu_context *ctx, 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); } @@ -5748,7 +6264,7 @@ static int osd_mount(const struct lu_env *env, struct osd_thread_info *info = osd_oti_get(env); struct lu_fid *fid = &info->oti_fid; struct inode *inode; - int rc = 0, force_over_128tb = 0; + int rc = 0, force_over_256tb = 0; ENTRY; if (o->od_mnt != NULL) @@ -5772,10 +6288,17 @@ static int osd_mount(const struct lu_env *env, RETURN(-EINVAL); } #endif - if (opts != NULL && strstr(opts, "force_over_128tb") != NULL) - force_over_128tb = 1; + if (opts != NULL && strstr(opts, "force_over_128tb") != NULL) { + CWARN("force_over_128tb option is depricated." + "Filesystems less then 256TB can be created without any" + "force options. Use force_over_256tb option for" + "filesystems greather then 256TB.\n"); + } - __page = alloc_page(GFP_IOFS); + if (opts != NULL && strstr(opts, "force_over_256tb") != NULL) + force_over_256tb = 1; + + __page = alloc_page(GFP_KERNEL); if (__page == NULL) GOTO(out, rc = -ENOMEM); page = (unsigned long)page_address(__page); @@ -5792,7 +6315,12 @@ static int osd_mount(const struct lu_env *env, "noextents", /* strip out option we processed in osd */ "bigendian_extents", - "force_over_128tb", +#if LUSTRE_VERSION_CODE >= OBD_OCD_VERSION(3,0,53,0) +#warning "remove force_over_128 option" +#else + "force_over_128tb (deprecated)", +#endif + "force_over_256tb", NULL }; strcat(options, opts); @@ -5838,11 +6366,11 @@ static int osd_mount(const struct lu_env *env, GOTO(out, rc); } - if (ldiskfs_blocks_count(LDISKFS_SB(osd_sb(o))->s_es) > (8ULL << 32) && - force_over_128tb == 0) { + if (ldiskfs_blocks_count(LDISKFS_SB(osd_sb(o))->s_es) > (64ULL << 30) && + force_over_256tb == 0) { CERROR("%s: device %s LDISKFS does not support filesystems " - "greater than 128TB and can cause data corruption. " - "Use \"force_over_128tb\" mount option to override.\n", + "greater than 256TB and can cause data corruption. " + "Use \"force_over_256tb\" mount option to override.\n", name, dev); GOTO(out, rc = -EINVAL); } @@ -6254,7 +6782,7 @@ static struct obd_ops osd_obd_device_ops = { .o_health_check = osd_health_check, }; -static int __init osd_mod_init(void) +static int __init osd_init(void) { int rc; @@ -6278,16 +6806,16 @@ static int __init osd_mod_init(void) 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. "); +MODULE_AUTHOR("OpenSFS, Inc. "); 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);