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-3871 osd: Tell QUOTA/NAME_LLOG fid in fid_is_on_ost check
[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
e059cf7
..
3c6f906
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,18
+208,18
@@
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);
int rc;
{
struct seq_server_site *ss = osd_seq_site(osd);
int rc;
- if (fid_
is_idif(fid
)) {
+ if (fid_
seq_is_idif(seq
)) {
fld_range_set_ost(range);
fld_range_set_ost(range);
- range->lsr_index =
fid_idif_ost_idx(fid
);
+ range->lsr_index =
idif_ost_idx(seq
);
return 0;
}
return 0;
}
- if (!fid_seq_in_fldb(
fid_seq(fid)
)) {
+ 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
fld_range_set_mdt(range);
if (ss != NULL)
/* FIXME: If ss is NULL, it suppose not get lsr_index
@@
-235,34
+230,26
@@
int osd_fld_lookup(const struct lu_env *env, struct osd_device *osd,
LASSERT(ss != NULL);
fld_range_set_any(range);
LASSERT(ss != NULL);
fld_range_set_any(range);
- rc = fld_server_lookup(env, ss->ss_server_fld,
fid_seq(fid)
, range);
+ rc = fld_server_lookup(env, ss->ss_server_fld,
seq
, range);
if (rc != 0)
if (rc != 0)
- CERROR("%s: cannot find FLD range for "
DFID
": rc = %d\n",
- osd_name(osd),
PFID(fid)
, rc);
+ CERROR("%s: cannot find FLD range for "
LPX64
": rc = %d\n",
+ osd_name(osd),
seq
, rc);
return rc;
}
int fid_is_on_ost(const struct lu_env *env, struct osd_device *osd,
const struct lu_fid *fid)
{
return rc;
}
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;
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 (rc != 0) {
- CERROR("%s: Can not lookup fld for "DFID"\n",
- osd_name(osd), PFID(fid));
- RETURN(rc);
- }
-
- CDEBUG(D_INFO, "fid "DFID" range "DRANGE"\n", PFID(fid),
- PRANGE(range));
+ if (unlikely(fid_is_local_file(fid) || fid_is_llog(fid)) ||
+ fid_is_name_llog(fid) || fid_is_quota(fid))
+ RETURN(0);
- if (
fld_range_is_ost(range)
)
+ if (
osd->od_is_ost
)
RETURN(1);
RETURN(0);
RETURN(1);
RETURN(0);
@@
-331,12
+318,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);
@@
-352,7
+334,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;
}
@@
-660,6
+642,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