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-2733 osd: osd-zfs to initialize existing sequence
[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
ba57610
..
794035e
100644
(file)
--- a/
lustre/osd-zfs/osd_oi.c
+++ b/
lustre/osd-zfs/osd_oi.c
@@
-90,7
+90,7
@@
struct named_oid {
};
static const struct named_oid oids[] = {
};
static const struct named_oid oids[] = {
- {
OFD_LAST_RECV_OID,
LAST_RCVD },
+ {
LAST_RECV_OID,
LAST_RCVD },
{ OFD_LAST_GROUP_OID, "LAST_GROUP" },
{ LLOG_CATALOGS_OID, "CATALOGS" },
{ MGS_CONFIGS_OID, NULL /*MOUNT_CONFIGS_DIR*/ },
{ OFD_LAST_GROUP_OID, "LAST_GROUP" },
{ LLOG_CATALOGS_OID, "CATALOGS" },
{ MGS_CONFIGS_OID, NULL /*MOUNT_CONFIGS_DIR*/ },
@@
-99,7
+99,6
@@
static const struct named_oid oids[] = {
{ MDD_CAPA_KEYS_OID, NULL /*CAPA_KEYS*/ },
{ FLD_INDEX_OID, "fld" },
{ MDD_LOV_OBJ_OID, LOV_OBJID },
{ MDD_CAPA_KEYS_OID, NULL /*CAPA_KEYS*/ },
{ FLD_INDEX_OID, "fld" },
{ MDD_LOV_OBJ_OID, LOV_OBJID },
- { MDT_LAST_RECV_OID, LAST_RCVD },
{ OFD_HEALTH_CHECK_OID, HEALTH_CHECK },
{ ACCT_USER_OID, "acct_usr_inode" },
{ ACCT_GROUP_OID, "acct_grp_inode" },
{ OFD_HEALTH_CHECK_OID, HEALTH_CHECK },
{ ACCT_USER_OID, "acct_usr_inode" },
{ ACCT_GROUP_OID, "acct_grp_inode" },
@@
-342,7
+341,7
@@
static struct osd_seq *osd_find_or_add_seq(const struct lu_env *env,
fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
fid_seq_is_idif(seq) ? 0 : seq);
fid_seq_is_mdt0(seq)) ? LPU64 : LPX64i,
fid_seq_is_idif(seq) ? 0 : seq);
- rc = osd_oi_create(env, osd, oi.oi_zapid, seq_name, &odb);
+ rc = osd_oi_
find_or_
create(env, osd, oi.oi_zapid, seq_name, &odb);
if (rc != 0) {
CERROR("%s: Can not create %s : rc = %d\n",
osd_name(osd), seq_name, rc);
if (rc != 0) {
CERROR("%s: Can not create %s : rc = %d\n",
osd_name(osd), seq_name, rc);