X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_handler.c;h=9dbef7cf6039a32fed7d2e2f96b98b4bff6c2bda;hp=1c9f610762959271136a6914ac7a0d968d8b239e;hb=dac584c6946d15e1ca9e6feeb26b164768041c40;hpb=6c48a3d3797ae23102c4d0d717842693fa1dc82d diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c index 1c9f610..9dbef7c 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, 2013, Intel Corporation. + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,6 +44,10 @@ #define DEBUG_SUBSYSTEM S_OSD #include +#include +#ifdef HAVE_UIDGID_HEADER +# include +#endif /* LUSTRE_VERSION_CODE */ #include @@ -54,6 +58,9 @@ /* XATTR_{REPLACE,CREATE} */ #include +#include +#include +#undef ENTRY /* * struct OBD_{ALLOC,FREE}*() * OBD_FAIL_CHECK @@ -72,7 +79,6 @@ #include #include -#include #include int ldiskfs_pdo = 1; @@ -86,6 +92,9 @@ CFS_MODULE_PARM(ldiskfs_track_declares_assert, "i", int, 0644, /* Slab to allocate dynlocks */ struct kmem_cache *dynlock_cachep; +/* Slab to allocate osd_it_ea */ +struct kmem_cache *osd_itea_cachep; + static struct lu_kmem_descr ldiskfs_caches[] = { { .ckd_cache = &dynlock_cachep, @@ -93,6 +102,11 @@ static struct lu_kmem_descr ldiskfs_caches[] = { .ckd_size = sizeof(struct dynlock_handle) }, { + .ckd_cache = &osd_itea_cachep, + .ckd_name = "osd_itea_cache", + .ckd_size = sizeof(struct osd_it_ea) + }, + { .ckd_cache = NULL } }; @@ -119,7 +133,6 @@ int osd_trans_declare_op2rb[] = { [OSD_OT_WRITE] = OSD_OT_WRITE, [OSD_OT_INSERT] = OSD_OT_DELETE, [OSD_OT_DELETE] = OSD_OT_INSERT, - [OSD_OT_UPDATE] = OSD_OT_MAX, [OSD_OT_QUOTA] = OSD_OT_MAX, }; @@ -288,119 +301,6 @@ 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 in_oi) -{ - struct inode *inode; - int rc = 0; - ENTRY; - - inode = ldiskfs_iget(osd_sb(dev), id->oii_ino); - if (IS_ERR(inode)) { - rc = PTR_ERR(inode); - if (!in_oi || (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 (!in_oi) { - 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 (!in_oi) { - 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 (!in_oi) { - CDEBUG(D_INODE, "stale inode: ino = %u\n", id->oii_ino); - - GOTO(put, rc); - } - - goto check_oi; - } - -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 some 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) - rc = -ENOENT; - else - rc = -EREMCHG; - } - } 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 @@ -473,15 +373,14 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj) if (rc == -ENODATA && !fid_is_igif(rfid) && osd->od_check_ff) { fid = &lma->lma_self_fid; rc = osd_get_idif(info, inode, dentry, fid); - if ((rc > 0) || (rc == -ENODATA && osd->od_lma_self_repair)) { + if ((rc > 0) || (rc == -ENODATA && osd->od_index_in_idif)) { /* For the given OST-object, if it has neither LMA nor * FID in XATTR_NAME_FID, then the given FID (which is * contained in the @obj, from client RPC for locating * the OST-object) is trusted. We use it to generate * the LMA. */ osd_lma_self_repair(info, osd, inode, rfid, - fid_is_on_ost(info, osd, fid, OI_CHECK_FLD) ? - LMAC_FID_ON_OST : 0); + LMAC_FID_ON_OST); RETURN(0); } } @@ -502,7 +401,7 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj) lma->lma_incompat & ~LMA_INCOMPAT_SUPP, PFID(rfid), inode->i_ino); rc = -EOPNOTSUPP; - } else if (!(lma->lma_compat & LMAC_NOT_IN_OI)) { + } else { fid = &lma->lma_self_fid; } } @@ -522,7 +421,7 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj) fid_to_ostid(fid, oi); ostid_to_fid(fid1, oi, idx); if (lu_fid_eq(fid1, rfid)) { - if (osd->od_lma_self_repair) + if (osd->od_index_in_idif) osd_lma_self_repair(info, osd, inode, rfid, LMAC_FID_ON_OST); @@ -531,8 +430,6 @@ static int osd_check_lma(const struct lu_env *env, struct osd_object *obj) } } - CDEBUG(D_INODE, "%s: FID "DFID" != self_fid "DFID"\n", - osd_name(osd), PFID(rfid), PFID(fid)); rc = -EREMCHG; } @@ -554,6 +451,7 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, int result; int saved = 0; bool in_oi = false; + bool in_cache = false; bool triggered = false; ENTRY; @@ -583,6 +481,7 @@ 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; } @@ -597,8 +496,7 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, /* 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_on_ost(info, dev, fid, OI_CHECK_FLD) || + if (!(fid_is_norm(fid) || fid_is_igif(fid)) || !ldiskfs_test_bit(osd_oi_fid2idx(dev,fid), sf->sf_oi_bitmap)) GOTO(out, result = 0); @@ -612,87 +510,107 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj, in_oi = true; iget: - inode = osd_iget_check(info, dev, fid, id, in_oi); + inode = osd_iget(info, dev, id); if (IS_ERR(inode)) { result = PTR_ERR(inode); - if (result == -ENOENT || result == -ESTALE) { - if (!in_oi) - fid_zero(&oic->oic_fid); + if (result != -ENOENT && result != -ESTALE) + GOTO(out, result); - GOTO(out, result = -ENOENT); - } else if (result == -EREMCHG) { + if (in_cache) + fid_zero(&oic->oic_fid); -trigger: - if (!in_oi) - 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 (unlikely(triggered)) - GOTO(out, result = saved); + /* 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); - triggered = true; - if (thread_is_running(&scrub->os_thread)) { +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 if (!dev->od_noscrub) { - result = osd_scrub_start(dev); - LCONSOLE_WARN("%.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. */ - saved = result; - result = osd_lookup_in_remote_parent(info, dev, - fid, id); - if (result == 0) { - in_oi = false; - goto iget; - } + else + result = -EREMCHG; + } - result = saved; + /* 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; } - GOTO(out, result); - } + GOTO(out, result = saved); + } - obj->oo_inode = inode; - LASSERT(obj->oo_inode->i_sb == osd_sb(dev)); + obj->oo_inode = inode; + LASSERT(obj->oo_inode->i_sb == osd_sb(dev)); result = osd_check_lma(env, obj); if (result != 0) { iput(inode); obj->oo_inode = NULL; - if (result == -EREMCHG) { - if (!in_oi) { - result = osd_oi_lookup(info, dev, fid, id, - OI_CHECK_FLD); - if (result != 0) { - fid_zero(&oic->oic_fid); - GOTO(out, result); - } - } + 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 (!in_oi && (fid_is_norm(fid) || fid_is_igif(fid)) && + ldiskfs_test_bit(osd_oi_fid2idx(dev, fid), + sf->sf_oi_bitmap)) goto trigger; - } - GOTO(out, result); + GOTO(out, result = 0); } obj->oo_compat_dot_created = 1; @@ -927,7 +845,7 @@ static void osd_trans_commit_cb(struct super_block *sb, lu_context_exit(&th->th_ctx); lu_context_fini(&th->th_ctx); - thandle_put(th); + OBD_FREE_PTR(oh); } static struct thandle *osd_trans_create(const struct lu_env *env, @@ -952,9 +870,6 @@ static struct thandle *osd_trans_create(const struct lu_env *env, th->th_result = 0; th->th_tags = LCT_TX_HANDLE; oh->ot_credits = 0; - atomic_set(&th->th_refc, 1); - th->th_alloc_size = sizeof(*oh); - oti->oti_dev = osd_dt_dev(d); INIT_LIST_HEAD(&oh->ot_dcb_list); osd_th_alloced(oh); @@ -972,8 +887,8 @@ static struct thandle *osd_trans_create(const struct lu_env *env, /* * Concurrency: shouldn't matter. */ -int osd_trans_start(const struct lu_env *env, struct dt_device *d, - struct thandle *th) +static int osd_trans_start(const struct lu_env *env, struct dt_device *d, + struct thandle *th) { struct osd_thread_info *oti = osd_oti_get(env); struct osd_device *dev = osd_dt_dev(d); @@ -1070,7 +985,7 @@ out: } static int osd_seq_exists(const struct lu_env *env, - struct osd_device *osd, obd_seq seq) + struct osd_device *osd, u64 seq) { struct lu_seq_range *range = &osd_oti_get(env)->oti_seq_range; struct seq_server_site *ss = osd_seq_site(osd); @@ -1101,7 +1016,8 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, struct osd_thandle *oh; struct osd_thread_info *oti = osd_oti_get(env); struct osd_iobuf *iobuf = &oti->oti_iobuf; - struct qsd_instance *qsd = oti->oti_dev->od_quota_slave; + struct osd_device *osd = osd_dt_dev(th->th_dev); + struct qsd_instance *qsd = osd->od_quota_slave; struct lquota_trans *qtrans; ENTRY; @@ -1125,19 +1041,20 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, oti->oti_txns--; rc = dt_txn_hook_stop(env, th); if (rc != 0) - CERROR("Failure in transaction hook: %d\n", rc); + CERROR("%s: failed in transaction hook: rc = %d\n", + osd_name(osd), rc); /* hook functions might modify th_sync */ hdl->h_sync = th->th_sync; - oh->ot_handle = NULL; - OSD_CHECK_SLOW_TH(oh, oti->oti_dev, - rc = ldiskfs_journal_stop(hdl)); - if (rc != 0) - CERROR("Failure to stop transaction: %d\n", rc); - } else { - thandle_put(&oh->ot_super); - } + oh->ot_handle = NULL; + OSD_CHECK_SLOW_TH(oh, osd, rc = ldiskfs_journal_stop(hdl)); + if (rc != 0) + CERROR("%s: failed to stop transaction: rc = %d\n", + osd_name(osd), rc); + } else { + OBD_FREE_PTR(oh); + } /* inform the quota slave device that the transaction is stopping */ qsd_op_end(env, qsd, qtrans); @@ -1153,7 +1070,7 @@ static int osd_trans_stop(const struct lu_env *env, struct dt_device *dt, */ wait_event(iobuf->dr_wait, atomic_read(&iobuf->dr_numreqs) == 0); - osd_fini_iobuf(oti->oti_dev, iobuf); + osd_fini_iobuf(osd, iobuf); if (!rc) rc = iobuf->dr_error; @@ -1356,8 +1273,16 @@ static void osd_conf_get(const struct lu_env *env, */ static int osd_sync(const struct lu_env *env, struct dt_device *d) { - CDEBUG(D_HA, "syncing OSD %s\n", LUSTRE_OSD_LDISKFS_NAME); - return ldiskfs_force_commit(osd_sb(osd_dt_dev(d))); + int rc; + + CDEBUG(D_CACHE, "syncing OSD %s\n", LUSTRE_OSD_LDISKFS_NAME); + + rc = ldiskfs_force_commit(osd_sb(osd_dt_dev(d))); + + CDEBUG(D_CACHE, "synced OSD %s: rc = %d\n", + LUSTRE_OSD_LDISKFS_NAME, rc); + + return rc; } /** @@ -1415,23 +1340,6 @@ static int osd_ro(const struct lu_env *env, struct dt_device *d) RETURN(rc); } -/* - * Concurrency: serialization provided by callers. - */ -static int osd_init_capa_ctxt(const struct lu_env *env, struct dt_device *d, - int mode, unsigned long timeout, __u32 alg, - struct lustre_capa_key *keys) -{ - struct osd_device *dev = osd_dt_dev(d); - ENTRY; - - dev->od_fl_capa = mode; - dev->od_capa_timeout = timeout; - dev->od_capa_alg = alg; - dev->od_capa_keys = keys; - RETURN(0); -} - /** * Note: we do not count into QUOTA here. * If we mount with --data_journal we may need more. @@ -1501,7 +1409,6 @@ static const struct dt_device_operations osd_dt_ops = { .dt_sync = osd_sync, .dt_ro = osd_ro, .dt_commit_async = osd_commit_async, - .dt_init_capa_ctxt = osd_init_capa_ctxt, }; static void osd_object_read_lock(const struct lu_env *env, @@ -1573,108 +1480,6 @@ static int osd_object_write_locked(const struct lu_env *env, return obj->oo_owner == env; } -static int capa_is_sane(const struct lu_env *env, - struct osd_device *dev, - struct lustre_capa *capa, - struct lustre_capa_key *keys) -{ - struct osd_thread_info *oti = osd_oti_get(env); - struct lustre_capa *tcapa = &oti->oti_capa; - struct obd_capa *oc; - int i, rc = 0; - ENTRY; - - oc = capa_lookup(dev->od_capa_hash, capa, 0); - if (oc) { - if (capa_is_expired(oc)) { - DEBUG_CAPA(D_ERROR, capa, "expired"); - rc = -ESTALE; - } - capa_put(oc); - RETURN(rc); - } - - if (capa_is_expired_sec(capa)) { - DEBUG_CAPA(D_ERROR, capa, "expired"); - RETURN(-ESTALE); - } - - spin_lock(&capa_lock); - for (i = 0; i < 2; i++) { - if (keys[i].lk_keyid == capa->lc_keyid) { - oti->oti_capa_key = keys[i]; - break; - } - } - spin_unlock(&capa_lock); - - if (i == 2) { - DEBUG_CAPA(D_ERROR, capa, "no matched capa key"); - RETURN(-ESTALE); - } - - rc = capa_hmac(tcapa->lc_hmac, capa, oti->oti_capa_key.lk_key); - if (rc) - RETURN(rc); - - if (memcmp(tcapa->lc_hmac, capa->lc_hmac, sizeof(capa->lc_hmac))) { - DEBUG_CAPA(D_ERROR, capa, "HMAC mismatch"); - RETURN(-EACCES); - } - - oc = capa_add(dev->od_capa_hash, capa); - capa_put(oc); - - RETURN(0); -} - -int osd_object_auth(const struct lu_env *env, struct dt_object *dt, - struct lustre_capa *capa, __u64 opc) -{ - const struct lu_fid *fid = lu_object_fid(&dt->do_lu); - struct osd_device *osd = osd_dev(dt->do_lu.lo_dev); - struct lu_capainfo *lci; - int rc; - - if (!osd->od_fl_capa) - return 0; - - if (capa == BYPASS_CAPA) - return 0; - - lci = lu_capainfo_get(env); - if (unlikely(lci == NULL)) - return 0; - - if (lci->lci_auth == LC_ID_NONE) - return 0; - - if (capa == NULL) { - CERROR("%s: no capability provided for FID "DFID": rc = %d\n", - osd_name(osd), PFID(fid), -EACCES); - return -EACCES; - } - - if (!lu_fid_eq(fid, &capa->lc_fid)) { - DEBUG_CAPA(D_ERROR, capa, "fid "DFID" mismatch with", - PFID(fid)); - return -EACCES; - } - - if (!capa_opc_supported(capa, opc)) { - DEBUG_CAPA(D_ERROR, capa, "opc "LPX64" not supported by", opc); - return -EACCES; - } - - rc = capa_is_sane(env, osd, capa, osd->od_capa_keys); - if (rc != 0) { - DEBUG_CAPA(D_ERROR, capa, "insane: rc = %d", rc); - return -EACCES; - } - - return 0; -} - static struct timespec *osd_inode_time(const struct lu_env *env, struct inode *inode, __u64 seconds) { @@ -1712,17 +1517,16 @@ static void osd_inode_getattr(const struct lu_env *env, } static int osd_attr_get(const struct lu_env *env, - struct dt_object *dt, - struct lu_attr *attr, - struct lustre_capa *capa) + struct dt_object *dt, + struct lu_attr *attr) { - struct osd_object *obj = osd_dt_obj(dt); + struct osd_object *obj = osd_dt_obj(dt); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LINVRNT(osd_invariant(obj)); + if (!dt_object_exists(dt)) + return -ENOENT; - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ)) - return -EACCES; + LASSERT(!dt_object_remote(dt)); + LINVRNT(osd_invariant(obj)); spin_lock(&obj->oo_guard); osd_inode_getattr(env, obj->oo_inode, attr); @@ -1951,21 +1755,20 @@ static int osd_quota_transfer(struct inode *inode, const struct lu_attr *attr) } static int osd_attr_set(const struct lu_env *env, - struct dt_object *dt, - const struct lu_attr *attr, - struct thandle *handle, - struct lustre_capa *capa) + struct dt_object *dt, + const struct lu_attr *attr, + struct thandle *handle) { - struct osd_object *obj = osd_dt_obj(dt); - struct inode *inode; - int rc; + struct osd_object *obj = osd_dt_obj(dt); + struct inode *inode; + int rc; - LASSERT(handle != NULL); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(osd_invariant(obj)); + if (!dt_object_exists(dt)) + return -ENOENT; - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE)) - return -EACCES; + LASSERT(handle != NULL); + LASSERT(!dt_object_remote(dt)); + LASSERT(osd_invariant(obj)); osd_trans_exec_op(env, handle, OSD_OT_ATTR_SET); @@ -2009,9 +1812,9 @@ static int osd_attr_set(const struct lu_env *env, return rc; } -struct dentry *osd_child_dentry_get(const struct lu_env *env, - struct osd_object *obj, - const char *name, const int namelen) +static struct dentry *osd_child_dentry_get(const struct lu_env *env, + struct osd_object *obj, + const char *name, const int namelen) { return osd_child_dentry_by_inode(env, obj->oo_inode, name, namelen); } @@ -2047,14 +1850,13 @@ static int osd_mkfile(struct osd_thread_info *info, struct osd_object *obj, osd_sb(osd)->s_root->d_inode, mode); if (!IS_ERR(inode)) { - /* Do not update file c/mtime in ldiskfs. - * NB: don't need any lock because no contention at this - * early stage */ - inode->i_flags |= S_NOCMTIME; + /* Do not update file c/mtime in ldiskfs. */ + inode->i_flags |= S_NOCMTIME; /* For new created object, it must be consistent, * and it is unnecessary to scrub against it. */ ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_NOSCRUB); + obj->oo_inode = inode; result = 0; } else { @@ -2281,13 +2083,18 @@ static int __osd_object_create(struct osd_thread_info *info, result = osd_create_type_f(dof->dof_type)(info, obj, attr, hint, dof, th); - if (result == 0) { + if (likely(obj->oo_inode != NULL)) { + LASSERT(obj->oo_inode->i_state & I_NEW); + + /* Unlock the inode before attr initialization to avoid + * unnecessary dqget operations. LU-6378 */ + unlock_new_inode(obj->oo_inode); + } + + if (likely(result == 0)) { osd_attr_init(info, obj, attr, dof); osd_object_init0(obj); - /* bz 24037 */ - if (obj->oo_inode && (obj->oo_inode->i_state & I_NEW)) - unlock_new_inode(obj->oo_inode); - } + } /* restore previous umask value */ current->fs->umask = umask; @@ -2318,7 +2125,7 @@ static int __osd_oi_insert(const struct lu_env *env, struct osd_object *obj, } int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd, - obd_seq seq, struct lu_seq_range *range) + u64 seq, struct lu_seq_range *range) { struct seq_server_site *ss = osd_seq_site(osd); @@ -2392,22 +2199,23 @@ static int osd_declare_object_create(const struct lu_env *env, } static int osd_object_create(const struct lu_env *env, struct dt_object *dt, - struct lu_attr *attr, - struct dt_allocation_hint *hint, - struct dt_object_format *dof, - struct thandle *th) + struct lu_attr *attr, + struct dt_allocation_hint *hint, + struct dt_object_format *dof, struct thandle *th) { - 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; + 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; + ENTRY; - ENTRY; + if (dt_object_exists(dt)) + return -EEXIST; - LINVRNT(osd_invariant(obj)); - LASSERT(!dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(osd_write_locked(env, obj)); - LASSERT(th != NULL); + LINVRNT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(osd_write_locked(env, obj)); + LASSERT(th != NULL); if (unlikely(fid_is_acct(fid))) /* Quota files can't be created from the kernel any more, @@ -2574,8 +2382,8 @@ int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode, * \ldiskfs_dentry_param is used only to pass fid from osd to ldiskfs. * its inmemory API. */ -void osd_get_ldiskfs_dirent_param(struct ldiskfs_dentry_param *param, - const struct lu_fid *fid) +static void osd_get_ldiskfs_dirent_param(struct ldiskfs_dentry_param *param, + const struct lu_fid *fid) { if (!fid_is_namespace_visible(fid) || OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF)) { @@ -2658,6 +2466,9 @@ static struct inode *osd_create_local_agent_inode(const struct lu_env *env, RETURN(local); } + ldiskfs_set_inode_state(local, LDISKFS_STATE_LUSTRE_NOSCRUB); + unlock_new_inode(local); + /* Set special LMA flag for local agent inode */ rc = osd_ea_fid_set(info, local, fid, 0, LMAI_AGENT); if (rc != 0) { @@ -2720,22 +2531,25 @@ static int osd_delete_local_agent_inode(const struct lu_env *env, * \retval -ve, on error */ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt, - struct lu_attr *attr, - struct dt_allocation_hint *hint, - struct dt_object_format *dof, - struct thandle *th) + struct lu_attr *attr, + struct dt_allocation_hint *hint, + struct dt_object_format *dof, + struct thandle *th) { - 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; + 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; - ENTRY; + ENTRY; - LASSERT(osd_invariant(obj)); - LASSERT(!dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(osd_write_locked(env, obj)); - LASSERT(th != NULL); + if (dt_object_exists(dt)) + RETURN(-EEXIST); + + LASSERT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(osd_write_locked(env, obj)); + LASSERT(th != NULL); if (unlikely(fid_is_acct(fid))) /* Quota files can't be created from the kernel any more, @@ -2745,12 +2559,24 @@ static int osd_object_ea_create(const struct lu_env *env, struct dt_object *dt, osd_trans_exec_op(env, th, OSD_OT_CREATE); osd_trans_declare_rb(env, th, OSD_OT_REF_ADD); - result = __osd_object_create(info, obj, attr, hint, dof, th); - if (result == 0) - result = osd_ea_fid_set(info, obj->oo_inode, fid, + result = __osd_object_create(info, obj, attr, hint, dof, th); + if (result == 0) { + if (fid_is_idif(fid) && + !osd_dev(dt->do_lu.lo_dev)->od_index_in_idif) { + struct lu_fid *tfid = &info->oti_fid; + struct ost_id *oi = &info->oti_ostid; + + fid_to_ostid(fid, oi); + ostid_to_fid(tfid, oi, 0); + result = osd_ea_fid_set(info, obj->oo_inode, tfid, + LMAC_FID_ON_OST, 0); + } else { + 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); + } + } if (result == 0) result = __osd_oi_insert(env, obj, fid, th); @@ -2783,20 +2609,23 @@ static int osd_declare_object_ref_add(const struct lu_env *env, * Concurrency: @dt is write locked. */ static int osd_object_ref_add(const struct lu_env *env, - struct dt_object *dt, struct thandle *th) + struct dt_object *dt, struct thandle *th) { struct osd_object *obj = osd_dt_obj(dt); struct inode *inode = obj->oo_inode; struct osd_thandle *oh; int rc = 0; - LINVRNT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(osd_write_locked(env, obj)); - LASSERT(th != NULL); + if (!dt_object_exists(dt)) + return -ENOENT; - oh = container_of0(th, struct osd_thandle, ot_super); - LASSERT(oh->ot_handle != NULL); + LINVRNT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(osd_write_locked(env, obj)); + LASSERT(th != NULL); + + oh = container_of0(th, struct osd_thandle, ot_super); + LASSERT(oh->ot_handle != NULL); osd_trans_exec_op(env, th, OSD_OT_REF_ADD); @@ -2831,16 +2660,16 @@ static int osd_object_ref_add(const struct lu_env *env, } static int osd_declare_object_ref_del(const struct lu_env *env, - struct dt_object *dt, - struct thandle *handle) + struct dt_object *dt, + struct thandle *handle) { - struct osd_thandle *oh; + struct osd_thandle *oh; - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(handle != NULL); + LASSERT(!dt_object_remote(dt)); + LASSERT(handle != NULL); - oh = container_of0(handle, struct osd_thandle, ot_super); - LASSERT(oh->ot_handle == NULL); + oh = container_of0(handle, struct osd_thandle, ot_super); + LASSERT(oh->ot_handle == NULL); osd_trans_declare_op(env, oh, OSD_OT_REF_DEL, osd_dto_credits_noquota[DTO_ATTR_SET_BASE]); @@ -2852,20 +2681,23 @@ static int osd_declare_object_ref_del(const struct lu_env *env, * Concurrency: @dt is write locked. */ static int osd_object_ref_del(const struct lu_env *env, struct dt_object *dt, - struct thandle *th) + struct thandle *th) { struct osd_object *obj = osd_dt_obj(dt); struct inode *inode = obj->oo_inode; struct osd_device *osd = osd_dev(dt->do_lu.lo_dev); struct osd_thandle *oh; + if (!dt_object_exists(dt)) + return -ENOENT; + LINVRNT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); + LASSERT(!dt_object_remote(dt)); LASSERT(osd_write_locked(env, obj)); LASSERT(th != NULL); - oh = container_of0(th, struct osd_thandle, ot_super); - LASSERT(oh->ot_handle != NULL); + oh = container_of0(th, struct osd_thandle, ot_super); + LASSERT(oh->ot_handle != NULL); osd_trans_exec_op(env, th, OSD_OT_REF_DEL); @@ -2912,8 +2744,7 @@ static int osd_object_version_get(const struct lu_env *env, * Concurrency: @dt is read locked. */ static int osd_xattr_get(const struct lu_env *env, struct dt_object *dt, - struct lu_buf *buf, const char *name, - struct lustre_capa *capa) + struct lu_buf *buf, const char *name) { struct osd_object *obj = osd_dt_obj(dt); struct inode *inode = obj->oo_inode; @@ -2935,11 +2766,12 @@ static int osd_xattr_get(const struct lu_env *env, struct dt_object *dt, return sizeof(dt_obj_version_t); } - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(inode->i_op != NULL && inode->i_op->getxattr != NULL); + if (!dt_object_exists(dt)) + return -ENOENT; - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ)) - return -EACCES; + LASSERT(!dt_object_remote(dt)); + LASSERT(inode->i_op != NULL); + LASSERT(inode->i_op->getxattr != NULL); return __osd_xattr_get(inode, dentry, name, buf->lb_buf, buf->lb_len); } @@ -3007,8 +2839,8 @@ static void osd_object_version_set(const struct lu_env *env, * Concurrency: @dt is write locked. */ static int osd_xattr_set(const struct lu_env *env, struct dt_object *dt, - const struct lu_buf *buf, const char *name, int fl, - struct thandle *handle, struct lustre_capa *capa) + const struct lu_buf *buf, const char *name, int fl, + struct thandle *handle) { struct osd_object *obj = osd_dt_obj(dt); struct inode *inode = obj->oo_inode; @@ -3027,9 +2859,6 @@ static int osd_xattr_set(const struct lu_env *env, struct dt_object *dt, return sizeof(dt_obj_version_t); } - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE)) - return -EACCES; - CDEBUG(D_INODE, DFID" set xattr '%s' with size %zu\n", PFID(lu_object_fid(&dt->do_lu)), name, buf->lb_len); @@ -3068,36 +2897,37 @@ static int osd_xattr_set(const struct lu_env *env, struct dt_object *dt, * Concurrency: @dt is read locked. */ static int osd_xattr_list(const struct lu_env *env, struct dt_object *dt, - struct lu_buf *buf, struct lustre_capa *capa) + const struct lu_buf *buf) { - struct osd_object *obj = osd_dt_obj(dt); - struct inode *inode = obj->oo_inode; - struct osd_thread_info *info = osd_oti_get(env); - struct dentry *dentry = &info->oti_obj_dentry; + struct osd_object *obj = osd_dt_obj(dt); + struct inode *inode = obj->oo_inode; + struct osd_thread_info *info = osd_oti_get(env); + struct dentry *dentry = &info->oti_obj_dentry; - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(inode->i_op != NULL && inode->i_op->listxattr != NULL); + if (!dt_object_exists(dt)) + return -ENOENT; - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_READ)) - return -EACCES; + LASSERT(!dt_object_remote(dt)); + LASSERT(inode->i_op != NULL); + LASSERT(inode->i_op->listxattr != NULL); - dentry->d_inode = inode; + dentry->d_inode = inode; dentry->d_sb = inode->i_sb; - return inode->i_op->listxattr(dentry, buf->lb_buf, buf->lb_len); + return inode->i_op->listxattr(dentry, buf->lb_buf, buf->lb_len); } static int osd_declare_xattr_del(const struct lu_env *env, - struct dt_object *dt, const char *name, - struct thandle *handle) + struct dt_object *dt, const char *name, + struct thandle *handle) { - struct osd_thandle *oh; + struct osd_thandle *oh; struct super_block *sb = osd_sb(osd_dev(dt->do_lu.lo_dev)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(handle != NULL); + LASSERT(!dt_object_remote(dt)); + LASSERT(handle != NULL); - oh = container_of0(handle, struct osd_thandle, ot_super); - LASSERT(oh->ot_handle == NULL); + oh = container_of0(handle, struct osd_thandle, ot_super); + LASSERT(oh->ot_handle == NULL); osd_trans_declare_op(env, oh, OSD_OT_XATTR_SET, osd_dto_credits_noquota[DTO_XATTR_SET]); @@ -3114,115 +2944,29 @@ static int osd_declare_xattr_del(const struct lu_env *env, * Concurrency: @dt is write locked. */ static int osd_xattr_del(const struct lu_env *env, struct dt_object *dt, - const char *name, struct thandle *handle, - struct lustre_capa *capa) + const char *name, struct thandle *handle) { - struct osd_object *obj = osd_dt_obj(dt); - struct inode *inode = obj->oo_inode; - struct osd_thread_info *info = osd_oti_get(env); - struct dentry *dentry = &info->oti_obj_dentry; - int rc; + struct osd_object *obj = osd_dt_obj(dt); + struct inode *inode = obj->oo_inode; + struct osd_thread_info *info = osd_oti_get(env); + struct dentry *dentry = &info->oti_obj_dentry; + int rc; - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(inode->i_op != NULL && inode->i_op->removexattr != NULL); - LASSERT(handle != NULL); + if (!dt_object_exists(dt)) + return -ENOENT; - if (osd_object_auth(env, dt, capa, CAPA_OPC_META_WRITE)) - return -EACCES; + LASSERT(!dt_object_remote(dt)); + LASSERT(inode->i_op != NULL); + LASSERT(inode->i_op->removexattr != NULL); + LASSERT(handle != NULL); osd_trans_exec_op(env, handle, OSD_OT_XATTR_SET); ll_vfs_dq_init(inode); - dentry->d_inode = inode; + dentry->d_inode = inode; dentry->d_sb = inode->i_sb; - rc = inode->i_op->removexattr(dentry, name); - return rc; -} - -static struct obd_capa *osd_capa_get(const struct lu_env *env, - struct dt_object *dt, - struct lustre_capa *old, __u64 opc) -{ - struct osd_thread_info *info = osd_oti_get(env); - const struct lu_fid *fid = lu_object_fid(&dt->do_lu); - struct osd_object *obj = osd_dt_obj(dt); - struct osd_device *osd = osd_obj2dev(obj); - struct lustre_capa_key *key = &info->oti_capa_key; - struct lustre_capa *capa = &info->oti_capa; - struct obd_capa *oc; - struct lu_capainfo *lci; - int rc; - ENTRY; - - if (!osd->od_fl_capa) - RETURN(ERR_PTR(-ENOENT)); - - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LINVRNT(osd_invariant(obj)); - - /* renewal sanity check */ - if (old && osd_object_auth(env, dt, old, opc)) - RETURN(ERR_PTR(-EACCES)); - - lci = lu_capainfo_get(env); - if (unlikely(lci == NULL)) - RETURN(ERR_PTR(-ENOENT)); - - switch (lci->lci_auth) { - case LC_ID_NONE: - RETURN(NULL); - case LC_ID_PLAIN: - capa->lc_uid = i_uid_read(obj->oo_inode); - capa->lc_gid = i_gid_read(obj->oo_inode); - capa->lc_flags = LC_ID_PLAIN; - break; - case LC_ID_CONVERT: { - __u32 d[4], s[4]; - - s[0] = i_uid_read(obj->oo_inode); - cfs_get_random_bytes(&(s[1]), sizeof(__u32)); - s[2] = i_uid_read(obj->oo_inode); - cfs_get_random_bytes(&(s[3]), sizeof(__u32)); - rc = capa_encrypt_id(d, s, key->lk_key, CAPA_HMAC_KEY_MAX_LEN); - if (unlikely(rc)) - RETURN(ERR_PTR(rc)); - - capa->lc_uid = ((__u64)d[1] << 32) | d[0]; - capa->lc_gid = ((__u64)d[3] << 32) | d[2]; - capa->lc_flags = LC_ID_CONVERT; - break; - } - default: - RETURN(ERR_PTR(-EINVAL)); - } - - capa->lc_fid = *fid; - capa->lc_opc = opc; - capa->lc_flags |= osd->od_capa_alg << 24; - capa->lc_timeout = osd->od_capa_timeout; - capa->lc_expiry = 0; - - oc = capa_lookup(osd->od_capa_hash, capa, 1); - if (oc) { - LASSERT(!capa_is_expired(oc)); - RETURN(oc); - } - - spin_lock(&capa_lock); - *key = osd->od_capa_keys[1]; - spin_unlock(&capa_lock); - - capa->lc_keyid = key->lk_keyid; - capa->lc_expiry = cfs_time_current_sec() + osd->od_capa_timeout; - - rc = capa_hmac(capa->lc_hmac, capa, key->lk_key); - if (rc) { - DEBUG_CAPA(D_ERROR, capa, "HMAC failed: %d for", rc); - RETURN(ERR_PTR(rc)); - } - - oc = capa_add(osd->od_capa_hash, capa); - RETURN(oc); + rc = inode->i_op->removexattr(dentry, name); + return rc; } static int osd_object_sync(const struct lu_env *env, struct dt_object *dt, @@ -3244,31 +2988,11 @@ static int osd_object_sync(const struct lu_env *env, struct dt_object *dt, file->f_op = inode->i_fop; set_file_inode(file, inode); -#ifdef HAVE_FILE_FSYNC_4ARGS - rc = file->f_op->fsync(file, start, end, 0); -#elif defined(HAVE_FILE_FSYNC_2ARGS) - mutex_lock(&inode->i_mutex); - rc = file->f_op->fsync(file, 0); - mutex_unlock(&inode->i_mutex); -#else - mutex_lock(&inode->i_mutex); - rc = file->f_op->fsync(file, dentry, 0); - mutex_unlock(&inode->i_mutex); -#endif + rc = ll_vfs_fsync_range(file, start, end, 0); RETURN(rc); } -static int osd_data_get(const struct lu_env *env, struct dt_object *dt, - void **data) -{ - struct osd_object *obj = osd_dt_obj(dt); - ENTRY; - - *data = (void *)obj->oo_inode; - RETURN(0); -} - /* * Index operations. */ @@ -3404,8 +3128,7 @@ static int osd_index_try(const struct lu_env *env, struct dt_object *dt, static int osd_otable_it_attr_get(const struct lu_env *env, struct dt_object *dt, - struct lu_attr *attr, - struct lustre_capa *capa) + struct lu_attr *attr) { attr->la_valid = 0; return 0; @@ -3436,9 +3159,7 @@ static const struct dt_object_operations osd_obj_ops = { .do_declare_xattr_del = osd_declare_xattr_del, .do_xattr_del = osd_xattr_del, .do_xattr_list = osd_xattr_list, - .do_capa_get = osd_capa_get, .do_object_sync = osd_object_sync, - .do_data_get = osd_data_get, }; /** @@ -3470,9 +3191,7 @@ static const struct dt_object_operations osd_obj_ea_ops = { .do_declare_xattr_del = osd_declare_xattr_del, .do_xattr_del = osd_xattr_del, .do_xattr_list = osd_xattr_list, - .do_capa_get = osd_capa_get, .do_object_sync = osd_object_sync, - .do_data_get = osd_data_get, }; static const struct dt_object_operations osd_obj_otable_it_ops = { @@ -3507,28 +3226,25 @@ static int osd_index_declare_iam_delete(const struct lu_env *env, * \retval 0 success * \retval -ve failure */ - static int osd_index_iam_delete(const struct lu_env *env, struct dt_object *dt, - const struct dt_key *key, - struct thandle *handle, - struct lustre_capa *capa) + const struct dt_key *key, + struct thandle *handle) { - struct osd_thread_info *oti = osd_oti_get(env); - struct osd_object *obj = osd_dt_obj(dt); - struct osd_thandle *oh; - struct iam_path_descr *ipd; - struct iam_container *bag = &obj->oo_dir->od_container; - int rc; - - ENTRY; + struct osd_thread_info *oti = osd_oti_get(env); + struct osd_object *obj = osd_dt_obj(dt); + struct osd_thandle *oh; + struct iam_path_descr *ipd; + struct iam_container *bag = &obj->oo_dir->od_container; + int rc; + ENTRY; - LINVRNT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(bag->ic_object == obj->oo_inode); - LASSERT(handle != NULL); + if (!dt_object_exists(dt)) + RETURN(-ENOENT); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_DELETE)) - RETURN(-EACCES); + LINVRNT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(bag->ic_object == obj->oo_inode); + LASSERT(handle != NULL); osd_trans_exec_op(env, handle, OSD_OT_DELETE); @@ -3562,7 +3278,7 @@ static int osd_index_declare_ea_delete(const struct lu_env *env, int rc; ENTRY; - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); + LASSERT(!dt_object_remote(dt)); LASSERT(handle != NULL); oh = container_of0(handle, struct osd_thandle, ot_super); @@ -3626,25 +3342,26 @@ static int osd_remote_fid(const struct lu_env *env, struct osd_device *osd, * \retval -ve, on error */ static int osd_index_ea_delete(const struct lu_env *env, struct dt_object *dt, - const struct dt_key *key, - struct thandle *handle, - struct lustre_capa *capa) -{ - struct osd_object *obj = osd_dt_obj(dt); - struct inode *dir = obj->oo_inode; - struct dentry *dentry; - struct osd_thandle *oh; + const struct dt_key *key, struct thandle *handle) +{ + struct osd_object *obj = osd_dt_obj(dt); + struct inode *dir = obj->oo_inode; + struct dentry *dentry; + struct osd_thandle *oh; struct ldiskfs_dir_entry_2 *de = NULL; - struct buffer_head *bh; - struct htree_lock *hlock = NULL; + struct buffer_head *bh; + struct htree_lock *hlock = NULL; struct lu_fid *fid = &osd_oti_get(env)->oti_fid; struct osd_device *osd = osd_dev(dt->do_lu.lo_dev); int rc; - ENTRY; + ENTRY; - LINVRNT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(handle != NULL); + if (!dt_object_exists(dt)) + RETURN(-ENOENT); + + LINVRNT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(handle != NULL); osd_trans_exec_op(env, handle, OSD_OT_DELETE); @@ -3652,9 +3369,6 @@ static int osd_index_ea_delete(const struct lu_env *env, struct dt_object *dt, LASSERT(oh->ot_handle != NULL); LASSERT(oh->ot_handle->h_transaction != NULL); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_DELETE)) - RETURN(-EACCES); - ll_vfs_dq_init(dir); dentry = osd_child_dentry_get(env, obj, (char *)key, strlen((char *)key)); @@ -3783,25 +3497,23 @@ out: * \retval -ve failure */ static int osd_index_iam_lookup(const struct lu_env *env, struct dt_object *dt, - struct dt_rec *rec, const struct dt_key *key, - struct lustre_capa *capa) + struct dt_rec *rec, const struct dt_key *key) { - struct osd_object *obj = osd_dt_obj(dt); - struct iam_path_descr *ipd; - struct iam_container *bag = &obj->oo_dir->od_container; - struct osd_thread_info *oti = osd_oti_get(env); - struct iam_iterator *it = &oti->oti_idx_it; - struct iam_rec *iam_rec; - int rc; - - ENTRY; + struct osd_object *obj = osd_dt_obj(dt); + struct iam_path_descr *ipd; + struct iam_container *bag = &obj->oo_dir->od_container; + struct osd_thread_info *oti = osd_oti_get(env); + struct iam_iterator *it = &oti->oti_idx_it; + struct iam_rec *iam_rec; + int rc; + ENTRY; - LASSERT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(bag->ic_object == obj->oo_inode); + if (!dt_object_exists(dt)) + RETURN(-ENOENT); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_LOOKUP)) - RETURN(-EACCES); + LASSERT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); + LASSERT(bag->ic_object == obj->oo_inode); ipd = osd_idx_ipd_get(env, bag); if (IS_ERR(ipd)) @@ -3872,27 +3584,28 @@ static int osd_index_declare_iam_insert(const struct lu_env *env, * \retval -ve failure */ static int osd_index_iam_insert(const struct lu_env *env, struct dt_object *dt, - const struct dt_rec *rec, - const struct dt_key *key, struct thandle *th, - struct lustre_capa *capa, int ignore_quota) -{ - struct osd_object *obj = osd_dt_obj(dt); - struct iam_path_descr *ipd; - struct osd_thandle *oh; - struct iam_container *bag = &obj->oo_dir->od_container; - struct osd_thread_info *oti = osd_oti_get(env); - struct iam_rec *iam_rec; - int rc; + const struct dt_rec *rec, + const struct dt_key *key, struct thandle *th, + int ignore_quota) +{ + struct osd_object *obj = osd_dt_obj(dt); + struct iam_path_descr *ipd; + struct osd_thandle *oh; + struct iam_container *bag; + struct osd_thread_info *oti = osd_oti_get(env); + struct iam_rec *iam_rec; + int rc; + ENTRY; - ENTRY; + if (!dt_object_exists(dt)) + RETURN(-ENOENT); - LINVRNT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); - LASSERT(bag->ic_object == obj->oo_inode); - LASSERT(th != NULL); + LINVRNT(osd_invariant(obj)); + LASSERT(!dt_object_remote(dt)); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_INSERT)) - RETURN(-EACCES); + bag = &obj->oo_dir->od_container; + LASSERT(bag->ic_object == obj->oo_inode); + LASSERT(th != NULL); osd_trans_exec_op(env, th, OSD_OT_INSERT); @@ -3974,8 +3687,8 @@ static int __osd_ea_add_rec(struct osd_thread_info *info, else de->file_type = LDISKFS_DIRENT_LUFID | LDISKFS_FT_DIR; - ldiskfs_journal_dirty_metadata(oth->ot_handle, - bh); + ldiskfs_handle_dirty_metadata(oth->ot_handle, + NULL, bh); brelse(bh); } } @@ -4028,8 +3741,7 @@ static int osd_add_dot_dotdot(struct osd_thread_info *info, dot_dot_fid, NULL, th); } - if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT) || - OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT2)) { + if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT)) { struct lu_fid tfid = *dot_dot_fid; tfid.f_oid--; @@ -4118,6 +3830,9 @@ osd_consistency_check(struct osd_thread_info *oti, struct osd_device *dev, if (!fid_is_norm(fid) && !fid_is_igif(fid)) RETURN_EXIT; + if (scrub->os_pos_current > id->oii_ino) + RETURN_EXIT; + again: rc = osd_oi_lookup(oti, dev, fid, id, OI_CHECK_FLD); if (rc != 0 && rc != -ENOENT) @@ -4139,12 +3854,13 @@ again: } if (!dev->od_noscrub && ++once == 1) { - rc = osd_scrub_start(dev); - LCONSOLE_WARN("%.16s: trigger OI scrub by RPC for "DFID - ", rc = %d [2]\n", - LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, - PFID(fid), rc); - if (rc == 0) + rc = osd_scrub_start(dev, SS_AUTO_PARTIAL | SS_CLEAR_DRYRUN | + SS_CLEAR_FAILOUT); + CDEBUG(D_LFSCK | D_CONSOLE, "%.16s: trigger OI scrub by RPC " + "for "DFID", rc = %d [2]\n", + LDISKFS_SB(osd_sb(dev))->s_es->s_volume_name, + PFID(fid), rc); + if (rc == 0 || rc == -EALREADY) goto again; } @@ -4176,16 +3892,14 @@ static int osd_fail_fid_lookup(struct osd_thread_info *oti, return rc; } -int osd_add_oi_cache(struct osd_thread_info *info, struct osd_device *osd, - struct osd_inode_id *id, const struct lu_fid *fid) +void osd_add_oi_cache(struct osd_thread_info *info, struct osd_device *osd, + struct osd_inode_id *id, const struct lu_fid *fid) { CDEBUG(D_INODE, "add "DFID" %u:%u to info %p\n", PFID(fid), id->oii_ino, id->oii_gen, info); info->oti_cache.oic_lid = *id; info->oti_cache.oic_fid = *fid; info->oti_cache.oic_dev = osd; - - return 0; } /** @@ -4218,7 +3932,7 @@ static int osd_get_pfid_from_linkea(const struct lu_env *env, struct lu_buf *buf = &oti->oti_big_buf; struct dentry *dentry = &oti->oti_obj_dentry; struct inode *inode = obj->oo_inode; - struct linkea_data ldata = { 0 }; + struct linkea_data ldata = { NULL }; int rc; ENTRY; @@ -4274,39 +3988,38 @@ again: * \retval -ve, on error */ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj, - struct dt_rec *rec, const struct dt_key *key) -{ - struct inode *dir = obj->oo_inode; - struct dentry *dentry; - struct ldiskfs_dir_entry_2 *de; - struct buffer_head *bh; - struct lu_fid *fid = (struct lu_fid *) rec; - struct htree_lock *hlock = NULL; - int ino; - int rc; + struct dt_rec *rec, const struct dt_key *key) +{ + struct inode *dir = obj->oo_inode; + struct dentry *dentry; + struct ldiskfs_dir_entry_2 *de; + struct buffer_head *bh; + struct lu_fid *fid = (struct lu_fid *) rec; + struct htree_lock *hlock = NULL; + int ino; + int rc; ENTRY; - LASSERT(dir->i_op != NULL && dir->i_op->lookup != NULL); + LASSERT(dir->i_op != NULL); + LASSERT(dir->i_op->lookup != NULL); - dentry = osd_child_dentry_get(env, obj, - (char *)key, strlen((char *)key)); + dentry = osd_child_dentry_get(env, obj, + (char *)key, strlen((char *)key)); - if (obj->oo_hl_head != NULL) { - hlock = osd_oti_get(env)->oti_hlock; - ldiskfs_htree_lock(hlock, obj->oo_hl_head, - dir, LDISKFS_HLOCK_LOOKUP); - } else { + if (obj->oo_hl_head != NULL) { + hlock = osd_oti_get(env)->oti_hlock; + ldiskfs_htree_lock(hlock, obj->oo_hl_head, + dir, LDISKFS_HLOCK_LOOKUP); + } else { down_read(&obj->oo_ext_idx_sem); - } + } - bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, hlock); - if (bh) { + bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, hlock); + if (bh) { struct osd_thread_info *oti = osd_oti_get(env); struct osd_inode_id *id = &oti->oti_id; struct osd_idmap_cache *oic = &oti->oti_cache; struct osd_device *dev = osd_obj2dev(obj); - struct osd_scrub *scrub = &dev->od_scrub; - struct scrub_file *sf = &scrub->os_file; ino = le32_to_cpu(de->inode); if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP)) { @@ -4320,13 +4033,19 @@ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj, /* done with de, release bh */ brelse(bh); if (rc != 0) { - if (unlikely(ino == osd_remote_parent_ino(dev))) + if (unlikely(ino == osd_remote_parent_ino(dev))) { + const char *name = (const char *)key; + /* If the parent is on remote MDT, and there * is no FID-in-dirent, then we have to get * the parent FID from the linkEA. */ - rc = osd_get_pfid_from_linkea(env, obj, fid); - else + if (likely(strlen(name) == 2 && + name[0] == '.' && name[1] == '.')) + rc = osd_get_pfid_from_linkea(env, obj, + fid); + } else { rc = osd_ea_fid_get(env, obj, ino, fid, id); + } } else { osd_id_gen(id, ino, OSD_OII_NOGEN); } @@ -4339,16 +4058,8 @@ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj, if (osd_remote_fid(env, dev, fid)) GOTO(out, rc = 0); - rc = osd_add_oi_cache(osd_oti_get(env), osd_obj2dev(obj), id, - fid); - if (rc != 0) - GOTO(out, rc); - if ((scrub->os_pos_current <= ino) && - ((sf->sf_flags & SF_INCONSISTENT) || - (sf->sf_flags & SF_UPGRADE && fid_is_igif(fid)) || - ldiskfs_test_bit(osd_oi_fid2idx(dev, fid), - sf->sf_oi_bitmap))) - osd_consistency_check(oti, dev, oic); + osd_add_oi_cache(osd_oti_get(env), osd_obj2dev(obj), id, fid); + osd_consistency_check(oti, dev, oic); } else { rc = -ENOENT; } @@ -4371,9 +4082,9 @@ out: * \retval osd_object on success * \retval -ve on error */ -struct osd_object *osd_object_find(const struct lu_env *env, - struct dt_object *dt, - const struct lu_fid *fid) +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; @@ -4496,9 +4207,9 @@ static int osd_index_declare_ea_insert(const struct lu_env *env, * \retval -ve, on error */ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, - const struct dt_rec *rec, - const struct dt_key *key, struct thandle *th, - struct lustre_capa *capa, int ignore_quota) + const struct dt_rec *rec, + const struct dt_key *key, struct thandle *th, + int ignore_quota) { struct osd_object *obj = osd_dt_obj(dt); struct osd_device *osd = osd_dev(dt->do_lu.lo_dev); @@ -4512,15 +4223,15 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, int rc; ENTRY; + if (!dt_object_exists(dt)) + RETURN(-ENOENT); + LASSERT(osd_invariant(obj)); - LASSERT(dt_object_exists(dt) && !dt_object_remote(dt)); + LASSERT(!dt_object_remote(dt)); LASSERT(th != NULL); osd_trans_exec_op(env, th, OSD_OT_INSERT); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_INSERT)) - RETURN(-EACCES); - LASSERTF(fid_is_sane(fid), "fid"DFID" is insane!\n", PFID(fid)); rc = osd_remote_fid(env, osd, fid); @@ -4586,30 +4297,21 @@ static int osd_index_ea_insert(const struct lu_env *env, struct dt_object *dt, */ static struct dt_it *osd_it_iam_init(const struct lu_env *env, - struct dt_object *dt, - __u32 unused, - struct lustre_capa *capa) + struct dt_object *dt, + __u32 unused) { - struct osd_it_iam *it; - struct osd_thread_info *oti = osd_oti_get(env); - struct osd_object *obj = osd_dt_obj(dt); - struct lu_object *lo = &dt->do_lu; - struct iam_path_descr *ipd; - struct iam_container *bag = &obj->oo_dir->od_container; - - LASSERT(lu_object_exists(lo)); + struct osd_it_iam *it; + struct osd_object *obj = osd_dt_obj(dt); + struct lu_object *lo = &dt->do_lu; + struct iam_path_descr *ipd; + struct iam_container *bag = &obj->oo_dir->od_container; - if (osd_object_auth(env, dt, capa, CAPA_OPC_BODY_READ)) - return ERR_PTR(-EACCES); + if (!dt_object_exists(dt)) + return ERR_PTR(-ENOENT); - if (oti->oti_it_inline) { - OBD_ALLOC_PTR(it); - if (it == NULL) - return ERR_PTR(-ENOMEM); - } else { - it = &oti->oti_it; - oti->oti_it_inline = 1; - } + OBD_ALLOC_PTR(it); + if (it == NULL) + return ERR_PTR(-ENOMEM); ipd = osd_it_ipd_get(env, bag); if (likely(ipd != NULL)) { @@ -4619,11 +4321,7 @@ static struct dt_it *osd_it_iam_init(const struct lu_env *env, iam_it_init(&it->oi_it, bag, IAM_IT_MOVE, ipd); return (struct dt_it *)it; } else { - if (it != &oti->oti_it) - OBD_FREE_PTR(it); - else - oti->oti_it_inline = 0; - + OBD_FREE_PTR(it); return ERR_PTR(-ENOMEM); } } @@ -4634,17 +4332,13 @@ static struct dt_it *osd_it_iam_init(const struct lu_env *env, static void osd_it_iam_fini(const struct lu_env *env, struct dt_it *di) { - struct osd_thread_info *oti = osd_oti_get(env); struct osd_it_iam *it = (struct osd_it_iam *)di; struct osd_object *obj = it->oi_obj; iam_it_fini(&it->oi_it); osd_ipd_put(env, &obj->oo_dir->od_container, it->oi_ipd); lu_object_put(env, &obj->oo_dt.do_lu); - if (it != &oti->oti_it) - OBD_FREE_PTR(it); - else - oti->oti_it_inline = 0; + OBD_FREE_PTR(it); } /** @@ -4883,42 +4577,43 @@ static const struct dt_index_operations osd_index_iam_ops = { */ static struct dt_it *osd_it_ea_init(const struct lu_env *env, struct dt_object *dt, - __u32 attr, - struct lustre_capa *capa) + __u32 attr) { struct osd_object *obj = osd_dt_obj(dt); struct osd_thread_info *info = osd_oti_get(env); - struct osd_it_ea *it; + struct osd_it_ea *oie; struct file *file; struct lu_object *lo = &dt->do_lu; - struct dentry *obj_dentry = &info->oti_it_dentry; + struct dentry *obj_dentry; ENTRY; - LASSERT(lu_object_exists(lo)); + if (!dt_object_exists(dt)) + RETURN(ERR_PTR(-ENOENT)); - if (info->oti_it_inline) { - OBD_ALLOC_PTR(it); - if (it == NULL) - RETURN(ERR_PTR(-ENOMEM)); - } else { - it = &info->oti_it_ea; - info->oti_it_inline = 1; - } + OBD_SLAB_ALLOC_PTR_GFP(oie, osd_itea_cachep, GFP_NOFS); + if (oie == NULL) + RETURN(ERR_PTR(-ENOMEM)); + obj_dentry = &oie->oie_dentry; obj_dentry->d_inode = obj->oo_inode; obj_dentry->d_sb = osd_sb(osd_obj2dev(obj)); obj_dentry->d_name.hash = 0; - it->oie_rd_dirent = 0; - it->oie_it_dirent = 0; - it->oie_dirent = NULL; - it->oie_buf = info->oti_it_ea_buf; - it->oie_obj = obj; + oie->oie_rd_dirent = 0; + oie->oie_it_dirent = 0; + oie->oie_dirent = NULL; + if (unlikely(!info->oti_it_ea_buf_used)) { + oie->oie_buf = info->oti_it_ea_buf; + info->oti_it_ea_buf_used = 1; + } else { + OBD_ALLOC(oie->oie_buf, OSD_IT_EA_BUFSIZE); + if (oie->oie_buf == NULL) + RETURN(ERR_PTR(-ENOMEM)); + } + oie->oie_obj = obj; + + file = &oie->oie_file; - file = &it->oie_file; - /* Reset the "file" totally to avoid to reuse any old value from - * former readdir handling, the "file->f_pos" should be zero. */ - memset(file, 0, sizeof(*file)); /* Only FMODE_64BITHASH or FMODE_32BITHASH should be set, NOT both. */ if (attr & LUDA_64BITHASH) file->f_mode = FMODE_64BITHASH; @@ -4930,7 +4625,7 @@ static struct dt_it *osd_it_ea_init(const struct lu_env *env, set_file_inode(file, obj->oo_inode); lu_object_get(lo); - RETURN((struct dt_it *) it); + RETURN((struct dt_it *) oie); } /** @@ -4940,18 +4635,19 @@ static struct dt_it *osd_it_ea_init(const struct lu_env *env, */ static void osd_it_ea_fini(const struct lu_env *env, struct dt_it *di) { - struct osd_thread_info *info = osd_oti_get(env); - struct osd_it_ea *it = (struct osd_it_ea *)di; - struct osd_object *obj = it->oie_obj; - struct inode *inode = obj->oo_inode; + struct osd_thread_info *info = osd_oti_get(env); + struct osd_it_ea *oie = (struct osd_it_ea *)di; + struct osd_object *obj = oie->oie_obj; + struct inode *inode = obj->oo_inode; - ENTRY; - it->oie_file.f_op->release(inode, &it->oie_file); - lu_object_put(env, &obj->oo_dt.do_lu); - if (it != &info->oti_it_ea) - OBD_FREE_PTR(it); + ENTRY; + oie->oie_file.f_op->release(inode, &oie->oie_file); + lu_object_put(env, &obj->oo_dt.do_lu); + if (unlikely(oie->oie_buf != info->oti_it_ea_buf)) + OBD_FREE(oie->oie_buf, OSD_IT_EA_BUFSIZE); else - info->oti_it_inline = 0; + info->oti_it_ea_buf_used = 0; + OBD_SLAB_FREE_PTR(oie, osd_itea_cachep); EXIT; } @@ -5202,7 +4898,7 @@ osd_dirent_update(handle_t *jh, struct super_block *sb, rec = (struct osd_fid_pack *)(de->name + de->name_len + 1); fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid); - rc = ldiskfs_journal_dirty_metadata(jh, bh); + rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh); RETURN(rc); } @@ -5260,7 +4956,7 @@ osd_dirent_reinsert(const struct lu_env *env, handle_t *jh, fid_cpu_to_be((struct lu_fid *)rec->fp_area, fid); de->file_type |= LDISKFS_DIRENT_LUFID; - rc = ldiskfs_journal_dirty_metadata(jh, bh); + rc = ldiskfs_handle_dirty_metadata(jh, NULL, bh); RETURN(rc); } @@ -5340,7 +5036,7 @@ osd_dirent_check_repair(const struct lu_env *env, struct osd_object *obj, osd_dto_credits_noquota[DTO_INDEX_INSERT] + 1 + 1 + 2; again: - if (dev->od_dirent_journal) { + if (dev->od_dirent_journal != 0) { jh = osd_journal_start_sb(sb, LDISKFS_HT_MISC, credits); if (IS_ERR(jh)) { rc = PTR_ERR(jh); @@ -5416,7 +5112,7 @@ again: GOTO(out_inode, rc = 0); } - if (!dev->od_dirent_journal) { + if (dev->od_dirent_journal == 0) { iput(inode); brelse(bh); if (hlock != NULL) @@ -5448,7 +5144,7 @@ again: GOTO(out_inode, rc = 0); } - if (!dev->od_dirent_journal) { + if (dev->od_dirent_journal == 0) { iput(inode); brelse(bh); if (hlock != NULL) @@ -5487,7 +5183,7 @@ again: GOTO(out_inode, rc = 0); } - if (!dev->od_dirent_journal) { + if (dev->od_dirent_journal == 0) { iput(inode); brelse(bh); if (hlock != NULL) @@ -5540,7 +5236,7 @@ out_journal: if (hlock != NULL) { ldiskfs_htree_unlock(hlock); } else { - if (dev->od_dirent_journal) + if (dev->od_dirent_journal != 0) up_write(&obj->oo_ext_idx_sem); else up_read(&obj->oo_ext_idx_sem); @@ -5569,11 +5265,8 @@ static inline int osd_it_ea_rec(const struct lu_env *env, struct osd_it_ea *it = (struct osd_it_ea *)di; struct osd_object *obj = it->oie_obj; struct osd_device *dev = osd_obj2dev(obj); - struct osd_scrub *scrub = &dev->od_scrub; - struct scrub_file *sf = &scrub->os_file; struct osd_thread_info *oti = osd_oti_get(env); struct osd_inode_id *id = &oti->oti_id; - struct osd_idmap_cache *oic = &oti->oti_cache; struct lu_fid *fid = &it->oie_dirent->oied_fid; struct lu_dirent *lde = (struct lu_dirent *)dtrec; __u32 ino = it->oie_dirent->oied_ino; @@ -5588,7 +5281,11 @@ static inline int osd_it_ea_rec(const struct lu_env *env, /* If the parent is on remote MDT, and there * is no FID-in-dirent, then we have to get * the parent FID from the linkEA. */ - osd_get_pfid_from_linkea(env, obj, fid); + if (!fid_is_sane(fid) && + it->oie_dirent->oied_namelen == 2 && + it->oie_dirent->oied_name[0] == '.' && + it->oie_dirent->oied_name[1] == '.') + osd_get_pfid_from_linkea(env, obj, fid); } else { rc = osd_dirent_check_repair(env, obj, it, fid, id, &attr); @@ -5596,19 +5293,21 @@ static inline int osd_it_ea_rec(const struct lu_env *env, } else { attr &= ~LU_DIRENT_ATTRS_MASK; if (!fid_is_sane(fid)) { - if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP) && - likely(it->oie_dirent->oied_namelen != 2 || - it->oie_dirent->oied_name[0] != '.' || - it->oie_dirent->oied_name[1] != '.')) - RETURN(-ENOENT); - - if (unlikely(ino == osd_remote_parent_ino(dev))) + if (it->oie_dirent->oied_namelen == 2 && + it->oie_dirent->oied_name[0] == '.' && + it->oie_dirent->oied_name[1] == '.') { /* If the parent is on remote MDT, and there * is no FID-in-dirent, then we have to get * the parent FID from the linkEA. */ - rc = osd_get_pfid_from_linkea(env, obj, fid); - else + if (ino == osd_remote_parent_ino(dev)) + rc = osd_get_pfid_from_linkea(env, obj, + fid); + } else { + if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP)) + RETURN(-ENOENT); + rc = osd_ea_fid_get(env, obj, ino, fid, id); + } } else { osd_id_gen(id, ino, OSD_OII_NOGEN); } @@ -5627,14 +5326,7 @@ static inline int osd_it_ea_rec(const struct lu_env *env, RETURN(0); if (likely(!(attr & LUDA_IGNORE) && rc == 0)) - rc = osd_add_oi_cache(oti, dev, id, fid); - - if (!(attr & LUDA_VERIFY) && - (scrub->os_pos_current <= ino) && - ((sf->sf_flags & SF_INCONSISTENT) || - (sf->sf_flags & SF_UPGRADE && fid_is_igif(fid)) || - ldiskfs_test_bit(osd_oi_fid2idx(dev, fid), sf->sf_oi_bitmap))) - osd_consistency_check(oti, dev, oic); + osd_add_oi_cache(oti, dev, id, fid); RETURN(rc > 0 ? 0 : rc); } @@ -5713,8 +5405,7 @@ static int osd_it_ea_load(const struct lu_env *env, * \retval -ve, on error */ static int osd_index_ea_lookup(const struct lu_env *env, struct dt_object *dt, - struct dt_rec *rec, const struct dt_key *key, - struct lustre_capa *capa) + struct dt_rec *rec, const struct dt_key *key) { struct osd_object *obj = osd_dt_obj(dt); int rc = 0; @@ -5724,9 +5415,6 @@ static int osd_index_ea_lookup(const struct lu_env *env, struct dt_object *dt, LASSERT(S_ISDIR(obj->oo_inode->i_mode)); LINVRNT(osd_invariant(obj)); - if (osd_object_auth(env, dt, capa, CAPA_OPC_INDEX_LOOKUP)) - return -EACCES; - rc = osd_ea_lookup_rec(env, obj, rec, key); if (rc == 0) rc = +1; @@ -5791,6 +5479,8 @@ static void osd_key_fini(const struct lu_context *ctx, { struct osd_thread_info *info = data; + if (info->oti_inode != NULL) + OBD_FREE_PTR(info->oti_inode); if (info->oti_hlock != NULL) ldiskfs_htree_lock_free(info->oti_hlock); OBD_FREE(info->oti_it_ea_buf, OSD_IT_EA_BUFSIZE); @@ -5913,7 +5603,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; + int rc = 0, force_over_128tb = 0; ENTRY; if (o->od_mnt != NULL) @@ -5923,23 +5613,64 @@ static int osd_mount(const struct lu_env *env, RETURN(-E2BIG); strcpy(o->od_mntdev, dev); - OBD_PAGE_ALLOC(__page, GFP_IOFS); - if (__page == NULL) - GOTO(out, rc = -ENOMEM); - str = lustre_cfg_string(cfg, 2); s_flags = simple_strtoul(str, NULL, 0); str = strstr(str, ":"); if (str) lmd_flags = simple_strtoul(str + 1, NULL, 0); opts = lustre_cfg_string(cfg, 3); +#ifdef __BIG_ENDIAN + if (opts == NULL || strstr(opts, "bigendian_extents") == NULL) { + CERROR("%s: device %s extents feature is not guaranteed to " + "work on big-endian systems. Use \"bigendian_extents\" " + "mount option to override.\n", name, dev); + RETURN(-EINVAL); + } +#endif + if (opts != NULL && strstr(opts, "force_over_128tb") != NULL) + force_over_128tb = 1; + + OBD_PAGE_ALLOC(__page, GFP_IOFS); + if (__page == NULL) + GOTO(out, rc = -ENOMEM); page = (unsigned long)page_address(__page); options = (char *)page; *options = '\0'; - if (opts == NULL) - strcat(options, "user_xattr,acl"); - else + if (opts != NULL) { + /* strip out the options for back compatiblity */ + static char *sout[] = { + "mballoc", + "iopen", + "noiopen", + "iopen_nopriv", + "extents", + "noextents", + /* strip out option we processed in osd */ + "bigendian_extents", + "force_over_128tb", + NULL + }; strcat(options, opts); + for (rc = 0, str = options; sout[rc]; ) { + char *op = strstr(str, sout[rc]); + if (op == NULL) { + rc++; + str = options; + continue; + } + if (op == options || *(op - 1) == ',') { + str = op + strlen(sout[rc]); + if (*str == ',' || *str == '\0') { + *str == ',' ? str++ : str; + memmove(op, str, strlen(str) + 1); + } + } + for (str = op; *str != ',' && *str != '\0'; str++) + ; + } + } else { + strncat(options, "user_xattr,acl", 14); + } /* Glom up mount options */ if (*options != '\0') @@ -5962,6 +5693,15 @@ 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) { + 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", + name, dev); + GOTO(out, rc = -EINVAL); + } + #ifdef HAVE_DEV_SET_RDONLY if (dev_check_rdonly(o->od_mnt->mnt_sb->s_bdev)) { CERROR("%s: underlying device %s is marked as read-only. " @@ -6047,10 +5787,6 @@ static int osd_device_init0(const struct lu_env *env, spin_lock_init(&o->od_osfs_lock); mutex_init(&o->od_otable_mutex); - o->od_capa_hash = init_capa_hash(); - if (o->od_capa_hash == NULL) - GOTO(out, rc = -ENOMEM); - o->od_read_cache = 1; o->od_writethrough_cache = 1; o->od_readcache_max_filesize = OSD_MAX_CACHE_SIZE; @@ -6059,15 +5795,17 @@ static int osd_device_init0(const struct lu_env *env, sizeof(o->od_svname)); if (cplen >= sizeof(o->od_svname)) { rc = -E2BIG; - GOTO(out_capa, rc); + GOTO(out, rc); } if (server_name_is_ost(o->od_svname)) o->od_is_ost = 1; + o->od_full_scrub_ratio = OFSR_DEFAULT; + o->od_full_scrub_threshold_rate = FULL_SCRUB_THRESHOLD_RATE_DEFAULT; rc = osd_mount(env, o, cfg); if (rc != 0) - GOTO(out_capa, rc); + GOTO(out, rc); rc = osd_obj_map_init(env, o); if (rc != 0) @@ -6082,9 +5820,6 @@ static int osd_device_init0(const struct lu_env *env, if (rc != 0) GOTO(out_site, rc); - /* self-repair LMA by default */ - o->od_lma_self_repair = 1; - INIT_LIST_HEAD(&o->od_ios_list); /* setup scrub, including OI files initialization */ rc = osd_scrub_setup(env, o); @@ -6098,7 +5833,8 @@ static int osd_device_init0(const struct lu_env *env, GOTO(out_scrub, rc); } - LASSERT(l->ld_site->ls_linkage.next && l->ld_site->ls_linkage.prev); + LASSERT(l->ld_site->ls_linkage.next != NULL); + LASSERT(l->ld_site->ls_linkage.prev != NULL); /* initialize quota slave instance */ o->od_quota_slave = qsd_init(env, o->od_svname, &o->od_dt_dev, @@ -6121,8 +5857,6 @@ out_compat: osd_obj_map_fini(o); out_mnt: osd_umount(env, o); -out_capa: - cleanup_capa_hash(o->od_capa_hash); out: return rc; } @@ -6160,7 +5894,6 @@ static struct lu_device *osd_device_free(const struct lu_env *env, struct osd_device *o = osd_dev(d); ENTRY; - cleanup_capa_hash(o->od_capa_hash); /* XXX: make osd top device in order to release reference */ d->ld_site->ls_top_dev = d; lu_site_purge(env, d->ld_site, -1); @@ -6274,10 +6007,12 @@ static int osd_obd_disconnect(struct obd_export *exp) } static int osd_prepare(const struct lu_env *env, struct lu_device *pdev, - struct lu_device *dev) + struct lu_device *dev) { - struct osd_device *osd = osd_dev(dev); - int result = 0; + struct osd_device *osd = osd_dev(dev); + struct lr_server_data *lsd = + &osd->od_dt_dev.dd_lu_dev.ld_site->ls_tgt->lut_lsd; + int result = 0; ENTRY; if (osd->od_quota_slave != NULL) { @@ -6287,13 +6022,28 @@ static int osd_prepare(const struct lu_env *env, struct lu_device *pdev, RETURN(result); } + if (lsd->lsd_feature_incompat & OBD_COMPAT_OST) { +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 52, 0) + if (lsd->lsd_feature_rocompat & OBD_ROCOMPAT_IDX_IN_IDIF) { + osd->od_index_in_idif = 1; + } else { + osd->od_index_in_idif = 0; + result = osd_register_proc_index_in_idif(osd); + if (result != 0) + RETURN(result); + } +#else + osd->od_index_in_idif = 1; +#endif + } + result = osd_fid_init(env, osd); RETURN(result); } -int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp, - struct lu_fid *fid, struct md_op_data *op_data) +static int osd_fid_alloc(const struct lu_env *env, struct obd_export *exp, + struct lu_fid *fid, struct md_op_data *op_data) { struct osd_device *osd = osd_dev(exp->exp_obd->obd_lu_dev); @@ -6330,13 +6080,21 @@ static const struct lu_device_type_operations osd_device_type_ops = { .ldto_device_fini = osd_device_fini }; -struct lu_device_type osd_device_type = { +static struct lu_device_type osd_device_type = { .ldt_tags = LU_DEVICE_DT, .ldt_name = LUSTRE_OSD_LDISKFS_NAME, .ldt_ops = &osd_device_type_ops, .ldt_ctx_tags = LCT_LOCAL, }; +static int osd_health_check(const struct lu_env *env, struct obd_device *obd) +{ + struct osd_device *osd = osd_dev(obd->obd_lu_dev); + struct super_block *sb = osd_sb(osd); + + return (osd->od_mnt == NULL || sb->s_flags & MS_RDONLY); +} + /* * lprocfs legacy support. */ @@ -6345,12 +6103,18 @@ static struct obd_ops osd_obd_device_ops = { .o_connect = osd_obd_connect, .o_disconnect = osd_obd_disconnect, .o_fid_alloc = osd_fid_alloc, + .o_health_check = osd_health_check, }; static int __init osd_mod_init(void) { int rc; +#if !defined(CONFIG_DEBUG_MUTEXES) && !defined(CONFIG_DEBUG_SPINLOCK) + /* please, try to keep osd_thread_info smaller than a page */ + CLASSERT(sizeof(struct osd_thread_info) <= PAGE_SIZE); +#endif + osd_oi_mod_init(); rc = lu_kmem_init(ldiskfs_caches); @@ -6373,6 +6137,8 @@ static void __exit osd_mod_exit(void) MODULE_AUTHOR("Sun Microsystems, Inc. "); MODULE_DESCRIPTION("Lustre Object Storage Device ("LUSTRE_OSD_LDISKFS_NAME")"); +MODULE_VERSION(LUSTRE_VERSION_STRING); MODULE_LICENSE("GPL"); -cfs_module(osd, "0.1.0", osd_mod_init, osd_mod_exit); +module_init(osd_mod_init); +module_exit(osd_mod_exit);