Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3569 ofd: packing ost_idx in IDIF
[fs/lustre-release.git]
/
lustre
/
osd-zfs
/
osd_oi.c
diff --git
a/lustre/osd-zfs/osd_oi.c
b/lustre/osd-zfs/osd_oi.c
index
8b780fc
..
00ce2ea
100644
(file)
--- a/
lustre/osd-zfs/osd_oi.c
+++ b/
lustre/osd-zfs/osd_oi.c
@@
-28,7
+28,7
@@
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012,
2013,
Intel Corporation.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-43,9
+43,6
@@
* Author: Di Wang <di.wang@intel.com>
*/
* Author: Di Wang <di.wang@intel.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_OSD
#include <lustre_ver.h>
#define DEBUG_SUBSYSTEM S_OSD
#include <lustre_ver.h>
@@
-96,13
+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" },
{ 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" },
{ 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_ORPHAN_OID, NULL },
{ 0, NULL }
};
{ 0, NULL }
};
@@
-213,61
+208,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,
* 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);
{
struct seq_server_site *ss = osd_seq_site(osd);
- int rc;
- if (fid_
is_root(fid
)) {
-
range->lsr_flags = LU_SEQ_RANGE_MDT
;
- range->lsr_index =
0
;
+ if (fid_
seq_is_idif(seq
)) {
+
fld_range_set_ost(range)
;
+ range->lsr_index =
idif_ost_idx(seq)
;
return 0;
}
return 0;
}
- if (fid_is_idif(fid)) {
- range->lsr_flags = LU_SEQ_RANGE_OST;
- range->lsr_index = fid_idif_ost_idx(fid);
- return 0;
- }
-
- if (!fid_is_norm(fid)) {
- range->lsr_flags = LU_SEQ_RANGE_MDT;
- /* If ss is NULL, it suppose not get lsr_index at all */
+ if (!fid_seq_in_fldb(seq)) {
+ fld_range_set_mdt(range);
if (ss != NULL)
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_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",
- osd_name(osd), 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)
{
}
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);
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) {
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);
RETURN(1);
RETURN(0);
@@
-336,12
+324,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);
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);
sprintf(seq_name, (fid_seq_is_rsvd(seq) ||
fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
fid_seq_is_idif(seq) ? 0 : seq);
@@
-357,7
+340,7
@@
static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env,
sprintf(key, "d%d", i);
rc = osd_oi_find_or_create(env, osd, odb, key, &sdb);
if (rc)
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;
}
osd_seq->os_compat_dirs[i] = sdb;
}
@@
-396,12
+379,13
@@
osd_get_idx_for_ost_obj(const struct lu_env *env, struct osd_device *osd,
PFID(fid));
return PTR_ERR(osd_seq);
}
PFID(fid));
return PTR_ERR(osd_seq);
}
- rc = fid_ostid_pack(fid, &osd_oti_get(env)->oti_ostid);
+
+ rc = fid_to_ostid(fid, &osd_oti_get(env)->oti_ostid);
LASSERT(rc == 0); /* we should not get here with IGIF */
LASSERT(rc == 0); /* we should not get here with IGIF */
- b = os
d_oti_get(env)->oti_ostid.oi_id
% OSD_OST_MAP_SIZE;
+ b = os
tid_id(&osd_oti_get(env)->oti_ostid)
% OSD_OST_MAP_SIZE;
LASSERT(osd_seq->os_compat_dirs[b]);
LASSERT(osd_seq->os_compat_dirs[b]);
- sprintf(buf, LPU64, os
d_oti_get(env)->oti_ostid.oi_id
);
+ sprintf(buf, LPU64, os
tid_id(&osd_oti_get(env)->oti_ostid)
);
return osd_seq->os_compat_dirs[b];
}
return osd_seq->os_compat_dirs[b];
}
@@
-664,6
+648,8
@@
osd_oi_init_compat(const struct lu_env *env, struct osd_device *o)
if (rc)
RETURN(rc);
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
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