X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_oi.c;h=1e3e990466ca2851dd02cee996c5f2661f72eaec;hb=a82badbac030338950e38d168ad4b84aaf6f58b6;hp=427bde0afae4f4d7b5b4b29f3eb53a55e66b47b9;hpb=aafe85fac4aa0589185048c57a0cce2b8c6618ee;p=fs%2Flustre-release.git diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c index 427bde0..1e3e990 100644 --- a/lustre/osd-zfs/osd_oi.c +++ b/lustre/osd-zfs/osd_oi.c @@ -28,7 +28,7 @@ * Use is subject to license terms. */ /* - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2013, Intel Corporation. * Use is subject to license terms. */ /* @@ -43,9 +43,6 @@ * Author: Di Wang */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_OSD #include @@ -96,14 +93,11 @@ static const struct named_oid oids[] = { { MGS_CONFIGS_OID, NULL /*MOUNT_CONFIGS_DIR*/ }, { FID_SEQ_SRV_OID, "seq_srv" }, { FID_SEQ_CTL_OID, "seq_ctl" }, - { MDD_CAPA_KEYS_OID, NULL /*CAPA_KEYS*/ }, { FLD_INDEX_OID, "fld" }, { MDD_LOV_OBJ_OID, LOV_OBJID }, { OFD_HEALTH_CHECK_OID, HEALTH_CHECK }, { ACCT_USER_OID, "acct_usr_inode" }, { ACCT_GROUP_OID, "acct_grp_inode" }, - { MDD_ROOT_INDEX_OID, NULL }, - { MDD_ORPHAN_OID, NULL }, { 0, NULL } }; @@ -133,7 +127,11 @@ osd_oi_lookup(const struct lu_env *env, struct osd_device *o, if (rc) return rc; - strncpy(oi->oi_name, name, OSD_OI_NAME_SIZE - 1); + rc = strlcpy(oi->oi_name, name, sizeof(oi->oi_name)); + if (rc >= sizeof(oi->oi_name)) + return -E2BIG; + + rc = 0; oi->oi_zapid = zde->zde_dnode; return rc; @@ -214,55 +212,54 @@ osd_oi_find_or_create(const struct lu_env *env, struct osd_device *o, * the object is located (tgt index) and it is MDT or OST object. */ int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd, - const struct lu_fid *fid, struct lu_seq_range *range) + obd_seq seq, struct lu_seq_range *range) { struct seq_server_site *ss = osd_seq_site(osd); - int rc; - if (fid_is_idif(fid)) { - range->lsr_flags = LU_SEQ_RANGE_OST; - range->lsr_index = fid_idif_ost_idx(fid); + if (fid_seq_is_idif(seq)) { + fld_range_set_ost(range); + range->lsr_index = idif_ost_idx(seq); return 0; } - if (!fid_is_norm(fid)) { - range->lsr_flags = LU_SEQ_RANGE_MDT; + if (!fid_seq_in_fldb(seq)) { + fld_range_set_mdt(range); if (ss != NULL) + /* FIXME: If ss is NULL, it suppose not get lsr_index + * at all */ range->lsr_index = ss->ss_node_id; return 0; } LASSERT(ss != NULL); - range->lsr_flags = -1; - rc = fld_server_lookup(env, ss->ss_server_fld, fid_seq(fid), range); - if (rc != 0) { - CERROR("%s can not find "DFID": rc = %d\n", - osd2lu_dev(osd)->ld_obd->obd_name, PFID(fid), rc); - } - return rc; + fld_range_set_any(range); + /* OSD will only do local fld lookup */ + return fld_local_lookup(env, ss->ss_server_fld, seq, range); } int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd, const struct lu_fid *fid) { - struct lu_seq_range *range = &osd_oti_get(env)->oti_seq_range; - int rc; + struct lu_seq_range *range = &osd_oti_get(env)->oti_seq_range; + int rc; ENTRY; if (fid_is_idif(fid)) RETURN(1); - rc = osd_fld_lookup(env, osd, fid, range); + if (unlikely(fid_is_local_file(fid) || fid_is_llog(fid)) || + fid_is_name_llog(fid) || fid_is_quota(fid)) + RETURN(0); + + rc = osd_fld_lookup(env, osd, fid_seq(fid), range); if (rc != 0) { - CERROR("%s: Can not lookup fld for "DFID"\n", - osd2lu_dev(osd)->ld_obd->obd_name, PFID(fid)); - RETURN(rc); + if (rc != -ENOENT) + CERROR("%s: "DFID" lookup failed: rc = %d\n", + osd_name(osd), PFID(fid), rc); + RETURN(0); } - CDEBUG(D_INFO, "fid "DFID" range "DRANGE"\n", PFID(fid), - PRANGE(range)); - - if (range->lsr_flags == LU_SEQ_RANGE_OST) + if (fld_range_is_ost(range)) RETURN(1); RETURN(0); @@ -273,7 +270,7 @@ static struct osd_seq *osd_seq_find_locked(struct osd_seq_list *seq_list, { struct osd_seq *osd_seq; - cfs_list_for_each_entry(osd_seq, &seq_list->osl_seq_list, os_seq_list) { + list_for_each_entry(osd_seq, &seq_list->osl_seq_list, os_seq_list) { if (osd_seq->os_seq == seq) return osd_seq; } @@ -320,7 +317,7 @@ static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env, if (osd_seq == NULL) GOTO(out, rc = -ENOMEM); - CFS_INIT_LIST_HEAD(&osd_seq->os_seq_list); + INIT_LIST_HEAD(&osd_seq->os_seq_list); osd_seq->os_seq = seq; /* Init subdir count to be 32, but each seq can have @@ -331,12 +328,7 @@ static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env, if (osd_seq->os_compat_dirs == NULL) GOTO(out, rc = -ENOMEM); - rc = osd_oi_lookup(env, osd, osd->od_root, "O", &oi); - if (rc != 0) { - CERROR("%s: Can not find O: rc = %d\n", osd_name(osd), rc); - GOTO(out, rc); - } - + oi.oi_zapid = osd->od_O_id; sprintf(seq_name, (fid_seq_is_rsvd(seq) || fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i, fid_seq_is_idif(seq) ? 0 : seq); @@ -348,19 +340,16 @@ static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env, GOTO(out, rc); } - if (seq == 0) - osd->od_ost_compat_grp0 = odb; - for (i = 0; i < OSD_OST_MAP_SIZE; i++) { sprintf(key, "d%d", i); rc = osd_oi_find_or_create(env, osd, odb, key, &sdb); if (rc) - GOTO(out, osd_seq = ERR_PTR(rc)); + GOTO(out, rc); osd_seq->os_compat_dirs[i] = sdb; } write_lock(&seq_list->osl_seq_list_lock); - cfs_list_add(&osd_seq->os_seq_list, &seq_list->osl_seq_list); + list_add(&osd_seq->os_seq_list, &seq_list->osl_seq_list); write_unlock(&seq_list->osl_seq_list_lock); out: up(&seq_list->osl_seq_init_sem); @@ -386,6 +375,7 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd, { struct osd_seq *osd_seq; unsigned long b; + obd_id id; int rc; osd_seq = osd_find_or_add_seq(env, osd, fid_seq(fid)); @@ -394,12 +384,19 @@ osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd, PFID(fid)); return PTR_ERR(osd_seq); } - rc = fid_ostid_pack(fid, &osd_oti_get(env)->oti_ostid); - LASSERT(rc == 0); /* we should not get here with IGIF */ - b = osd_oti_get(env)->oti_ostid.oi_id % OSD_OST_MAP_SIZE; + + if (fid_is_last_id(fid)) { + id = 0; + } else { + rc = fid_to_ostid(fid, &osd_oti_get(env)->oti_ostid); + LASSERT(rc == 0); /* we should not get here with IGIF */ + id = ostid_id(&osd_oti_get(env)->oti_ostid); + } + + b = id % OSD_OST_MAP_SIZE; LASSERT(osd_seq->os_compat_dirs[b]); - sprintf(buf, LPU64, osd_oti_get(env)->oti_ostid.oi_id); + sprintf(buf, LPU64, id); return osd_seq->os_compat_dirs[b]; } @@ -437,10 +434,8 @@ uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd, LASSERT(fid); LASSERT(buf); - if (fid_is_on_ost(env, osd, fid) == 1) { + if (fid_is_on_ost(env, osd, fid) == 1 || fid_seq(fid) == FID_SEQ_ECHO) { zapid = osd_get_idx_for_ost_obj(env, osd, fid, buf); - } else if (fid_is_last_id(fid)) { - zapid = osd->od_ost_compat_grp0; } else if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) { /* special objects with fixed known fids get their name */ char *name = oid2name(fid_oid(fid)); @@ -496,6 +491,9 @@ int osd_fid_lookup(const struct lu_env *env, struct osd_device *dev, *oid = info->oti_zde.lzd_reg.zde_dnode; } + if (rc == 0) + dmu_prefetch(dev->od_objset.os, *oid, 0, 0); + RETURN(rc); } @@ -627,7 +625,7 @@ static void osd_ost_seq_init(const struct lu_env *env, struct osd_device *osd) { struct osd_seq_list *osl = &osd->od_seq_list; - CFS_INIT_LIST_HEAD(&osl->osl_seq_list); + INIT_LIST_HEAD(&osl->osl_seq_list); rwlock_init(&osl->osl_seq_list_lock); sema_init(&osl->osl_seq_init_sem, 1); } @@ -638,9 +636,9 @@ static void osd_ost_seq_fini(const struct lu_env *env, struct osd_device *osd) struct osd_seq *osd_seq, *tmp; write_lock(&osl->osl_seq_list_lock); - cfs_list_for_each_entry_safe(osd_seq, tmp, &osl->osl_seq_list, - os_seq_list) { - cfs_list_del(&osd_seq->os_seq_list); + list_for_each_entry_safe(osd_seq, tmp, &osl->osl_seq_list, + os_seq_list) { + list_del(&osd_seq->os_seq_list); OBD_FREE(osd_seq->os_compat_dirs, sizeof(uint64_t) * osd_seq->os_subdir_count); OBD_FREE(osd_seq, sizeof(*osd_seq)); @@ -664,6 +662,8 @@ osd_oi_init_compat(const struct lu_env *env, struct osd_device *o) if (rc) RETURN(rc); + o->od_O_id = sdb; + osd_ost_seq_init(env, o); /* Create on-disk indexes to maintain per-UID/GID inode usage. * Those new indexes are created in the top-level ZAP outside the