int rc;
dentry = osd_child_dentry_by_inode(env, dir, name, strlen(name));
- bh = osd_ldiskfs_find_entry(dir, dentry, &de, NULL);
+ bh = osd_ldiskfs_find_entry(dir, &dentry->d_name, &de, NULL, NULL);
if (bh) {
osd_id_gen(id, le32_to_cpu(de->inode), OSD_OII_NOGEN);
brelse(bh);
return PTR_ERR(inode);
}
- jh = ldiskfs_journal_start_sb(sb, 100);
+ jh = osd_journal_start_sb(sb, LDISKFS_HT_MISC, 100);
if (IS_ERR(jh))
return PTR_ERR(jh);
/* if previous failed then try found single OI from old filesystem */
rc = osd_oi_open(info, osd, OSD_OI_NAME_BASE, &oi[0], false);
if (rc == 0) { /* found single OI from old filesystem */
+ if (sf->sf_success_count == 0)
+ /* XXX: There is one corner case that if the OI_scrub
+ * file crashed or lost and we regard it upgrade,
+ * then we allow IGIF lookup to bypass OI files.
+ *
+ * The risk is that osd_fid_lookup() may found
+ * a wrong inode with the given IGIF especially
+ * when the MDT has performed file-level backup
+ * and restored after former upgrading from 1.8
+ * to 2.x. Fortunately, the osd_fid_lookup()can
+ * verify the inode to decrease the risk. */
+ osd_scrub_file_reset(scrub,
+ LDISKFS_SB(osd_sb(osd))->s_es->s_uuid,
+ SF_UPGRADE);
GOTO(out, rc = 1);
} else if (rc != -ENOENT) {
CERROR("%.16s: can't open %s: rc = %d\n",
LASSERT((rc & (rc - 1)) == 0);
osd->od_oi_table = oi;
osd->od_oi_count = rc;
- rc = 0;
+ if (sf->sf_oi_count != rc) {
+ sf->sf_oi_count = rc;
+ rc = osd_scrub_file_store(scrub);
+ if (rc < 0) {
+ osd_oi_table_put(info, oi, sf->sf_oi_count);
+ OBD_FREE(oi, sizeof(*oi) * OSD_OI_FID_NR_MAX);
+ }
+ } else {
+ rc = 0;
+ }
}
mutex_unlock(&oi_init_lock);
int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, enum oi_check_flags flags)
{
+ struct lu_seq_range *range = &info->oti_seq_range;
+ int rc;
ENTRY;
if (flags & OI_KNOWN_ON_OST)
RETURN(1);
if (unlikely(fid_is_local_file(fid) || fid_is_igif(fid) ||
- fid_is_llog(fid)))
+ fid_is_llog(fid)) || fid_is_name_llog(fid) ||
+ fid_is_quota(fid))
RETURN(0);
if (fid_is_idif(fid) || fid_is_last_id(fid))
if (!(flags & OI_CHECK_FLD))
RETURN(0);
- if (osd->od_is_ost)
+ rc = osd_fld_lookup(info->oti_env, osd, fid_seq(fid), range);
+ if (rc != 0) {
+ if (rc != -ENOENT)
+ CERROR("%s: lookup FLD "DFID": rc = %d\n",
+ osd_name(osd), PFID(fid), rc);
+ RETURN(0);
+ }
+
+ if (fld_range_is_ost(range))
RETURN(1);
RETURN(0);
if (fid_is_on_ost(info, osd, fid, flags) || fid_is_llog(fid))
return osd_obj_map_lookup(info, osd, fid, id);
- if (fid_is_fs_root(fid)) {
- osd_id_gen(id, osd_sb(osd)->s_root->d_inode->i_ino,
- osd_sb(osd)->s_root->d_inode->i_generation);
- return 0;
- }
- if (unlikely(fid_is_acct(fid)))
- return osd_acct_obj_lookup(info, osd, fid, id);
+ if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) {
+ int rc;
+ if (fid_is_fs_root(fid)) {
+ osd_id_gen(id, osd_sb(osd)->s_root->d_inode->i_ino,
+ osd_sb(osd)->s_root->d_inode->i_generation);
+ return 0;
+ }
+ if (unlikely(fid_is_acct(fid)))
+ return osd_acct_obj_lookup(info, osd, fid, id);
+
+ /* For other special FIDs, try OI first, then do spec lookup */
+ rc = __osd_oi_lookup(info, osd, fid, id);
+ if (rc == -ENOENT)
+ return osd_obj_spec_lookup(info, osd, fid, id);
+ return rc;
+ }
if (!osd->od_igif_inoi && fid_is_igif(fid)) {
osd_id_gen(id, lu_igif_ino(fid), lu_igif_gen(fid));
static int osd_oi_iam_refresh(struct osd_thread_info *oti, struct osd_oi *oi,
const struct dt_rec *rec, const struct dt_key *key,
- struct thandle *th, bool insert)
+ handle_t *th, bool insert)
{
struct iam_container *bag;
struct iam_path_descr *ipd;
- struct osd_thandle *oh;
int rc;
ENTRY;
if (unlikely(ipd == NULL))
RETURN(-ENOMEM);
- oh = container_of0(th, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
- LASSERT(oh->ot_handle->h_transaction != NULL);
+ LASSERT(th != NULL);
+ LASSERT(th->h_transaction != NULL);
if (insert)
- rc = iam_insert(oh->ot_handle, bag, (const struct iam_key *)key,
+ rc = iam_insert(th, bag, (const struct iam_key *)key,
(const struct iam_rec *)rec, ipd);
else
- rc = iam_update(oh->ot_handle, bag, (const struct iam_key *)key,
+ rc = iam_update(th, bag, (const struct iam_key *)key,
(const struct iam_rec *)rec, ipd);
osd_ipd_put(oti->oti_env, bag, ipd);
LINVRNT(osd_invariant(obj));
int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th, enum oi_check_flags flags)
+ handle_t *th, enum oi_check_flags flags)
{
struct lu_fid *oi_fid = &info->oti_fid2;
struct osd_inode_id *oi_id = &info->oti_id2;
}
static int osd_oi_iam_delete(struct osd_thread_info *oti, struct osd_oi *oi,
- const struct dt_key *key, struct thandle *handle)
+ const struct dt_key *key, handle_t *th)
{
- struct iam_container *bag;
- struct iam_path_descr *ipd;
- struct osd_thandle *oh;
- int rc;
- ENTRY;
+ struct iam_container *bag;
+ struct iam_path_descr *ipd;
+ int rc;
+ ENTRY;
- LASSERT(oi);
+ LASSERT(oi);
LASSERT(oi->oi_inode);
ll_vfs_dq_init(oi->oi_inode);
- bag = &oi->oi_dir.od_container;
- ipd = osd_idx_ipd_get(oti->oti_env, bag);
- if (unlikely(ipd == NULL))
- RETURN(-ENOMEM);
+ bag = &oi->oi_dir.od_container;
+ ipd = osd_idx_ipd_get(oti->oti_env, bag);
+ if (unlikely(ipd == NULL))
+ RETURN(-ENOMEM);
- oh = container_of0(handle, struct osd_thandle, ot_super);
- LASSERT(oh->ot_handle != NULL);
- LASSERT(oh->ot_handle->h_transaction != NULL);
+ LASSERT(th != NULL);
+ LASSERT(th->h_transaction != NULL);
- rc = iam_delete(oh->ot_handle, bag, (const struct iam_key *)key, ipd);
- osd_ipd_put(oti->oti_env, bag, ipd);
- LINVRNT(osd_invariant(obj));
- RETURN(rc);
+ rc = iam_delete(th, bag, (const struct iam_key *)key, ipd);
+ osd_ipd_put(oti->oti_env, bag, ipd);
+ LINVRNT(osd_invariant(obj));
+ RETURN(rc);
}
int osd_oi_delete(struct osd_thread_info *info,
struct osd_device *osd, const struct lu_fid *fid,
- struct thandle *th, enum oi_check_flags flags)
+ handle_t *th, enum oi_check_flags flags)
{
struct lu_fid *oi_fid = &info->oti_fid2;
int osd_oi_update(struct osd_thread_info *info, struct osd_device *osd,
const struct lu_fid *fid, const struct osd_inode_id *id,
- struct thandle *th, enum oi_check_flags flags)
+ handle_t *th, enum oi_check_flags flags)
{
struct lu_fid *oi_fid = &info->oti_fid2;
struct osd_inode_id *oi_id = &info->oti_id2;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff