* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#ifdef __KERNEL__
# include <libcfs/libcfs.h>
# include <linux/module.h>
-# include <linux/jbd.h>
#else /* __KERNEL__ */
# include <liblustre.h>
#endif
-#include <obd.h>
-#include <obd_class.h>
-#include <lustre_ver.h>
#include <obd_support.h>
-#include <lprocfs_status.h>
-
#include <dt_object.h>
-#include <md_object.h>
-#include <lustre_mdc.h>
#include <lustre_fid.h>
#include <lustre_fld.h>
#include "fld_internal.h"
-const char fld_index_name[] = "fld";
+static const char fld_index_name[] = "fld";
static const struct lu_seq_range IGIF_FLD_RANGE = {
.lsr_start = FID_SEQ_IGIF,
.lsr_flags = LU_SEQ_RANGE_MDT
};
-const struct dt_index_features fld_index_features = {
+static const struct lu_seq_range DOT_LUSTRE_FLD_RANGE = {
+ .lsr_start = FID_SEQ_DOT_LUSTRE,
+ .lsr_end = FID_SEQ_DOT_LUSTRE + 1,
+ .lsr_index = 0,
+ .lsr_flags = LU_SEQ_RANGE_MDT
+};
+
+static const struct lu_seq_range ROOT_FLD_RANGE = {
+ .lsr_start = FID_SEQ_ROOT,
+ .lsr_end = FID_SEQ_ROOT + 1,
+ .lsr_index = 0,
+ .lsr_flags = LU_SEQ_RANGE_MDT
+};
+
+static const struct dt_index_features fld_index_features = {
.dif_flags = DT_IND_UPDATE,
.dif_keysize_min = sizeof(seqno_t),
.dif_keysize_max = sizeof(seqno_t),
fld->lsf_name, PRANGE(range), rc);
GOTO(out, rc);
}
- memcpy(tmp, new_range, sizeof(*new_range));
+ *tmp = *new_range;
tmp->lsr_start = range->lsr_start;
} else {
- memcpy(tmp, new_range, sizeof(*new_range));
+ *tmp = *new_range;
}
range_cpu_to_be(tmp, tmp);
info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
- LASSERT_MUTEX_LOCKED(&fld->lsf_lock);
+ LASSERT(mutex_is_locked(&fld->lsf_lock));
range = &info->fti_lrange;
memset(range, 0, sizeof(*range));
BYPASS_CAPA);
if (rc != 0)
GOTO(out, rc);
- memcpy(tmp, new_range, sizeof(*new_range));
+ *tmp = *new_range;
tmp->lsr_start = range->lsr_start;
deleted = 1;
} else {
- memcpy(tmp, new_range, sizeof(*new_range));
+ *tmp = *new_range;
}
range_cpu_to_be(tmp, tmp);
if (IS_ERR(flde))
GOTO(out, rc = PTR_ERR(flde));
- spin_lock(&fld->lsf_cache->fci_lock);
+ write_lock(&fld->lsf_cache->fci_lock);
if (deleted)
fld_cache_delete_nolock(fld->lsf_cache, new_range);
rc = fld_cache_insert_nolock(fld->lsf_cache, flde);
- spin_unlock(&fld->lsf_cache->fci_lock);
+ write_unlock(&fld->lsf_cache->fci_lock);
if (rc)
OBD_FREE_PTR(flde);
out:
RETURN(rc);
}
-static int fld_insert_igif_fld(struct lu_server_fld *fld,
- const struct lu_env *env)
+int fld_insert_entry(const struct lu_env *env,
+ struct lu_server_fld *fld,
+ const struct lu_seq_range *range)
{
struct thandle *th;
int rc;
if (IS_ERR(th))
RETURN(PTR_ERR(th));
- rc = fld_declare_index_create(env, fld, &IGIF_FLD_RANGE, th);
+ rc = fld_declare_index_create(env, fld, range, th);
if (rc != 0) {
if (rc == -EEXIST)
rc = 0;
if (rc)
GOTO(out, rc);
- rc = fld_index_create(env, fld, &IGIF_FLD_RANGE, th);
+ rc = fld_index_create(env, fld, range, th);
if (rc == -EEXIST)
rc = 0;
out:
dt_trans_stop(env, lu2dt_dev(fld->lsf_obj->do_lu.lo_dev), th);
RETURN(rc);
}
+EXPORT_SYMBOL(fld_insert_entry);
+
+static int fld_insert_special_entries(const struct lu_env *env,
+ struct lu_server_fld *fld)
+{
+ int rc;
+
+ rc = fld_insert_entry(env, fld, &IGIF_FLD_RANGE);
+ if (rc != 0)
+ RETURN(rc);
+
+ rc = fld_insert_entry(env, fld, &DOT_LUSTRE_FLD_RANGE);
+ if (rc != 0)
+ RETURN(rc);
+
+ rc = fld_insert_entry(env, fld, &ROOT_FLD_RANGE);
+
+ RETURN(rc);
+}
int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld,
struct dt_device *dt)
if (attr == NULL)
RETURN(-ENOMEM);
- memset(attr, 0, sizeof(attr));
+ memset(attr, 0, sizeof(*attr));
attr->la_valid = LA_MODE;
attr->la_mode = S_IFREG | 0666;
dof.dof_type = DFT_INDEX;
fld->lsf_obj = dt_obj;
rc = dt_obj->do_ops->do_index_try(env, dt_obj, &fld_index_features);
- if (rc == 0) {
- LASSERT(dt_obj->do_index_ops != NULL);
- mutex_lock(&fld->lsf_lock);
- rc = fld_insert_igif_fld(fld, env);
- mutex_unlock(&fld->lsf_lock);
- if (rc != 0) {
- CERROR("insert igif in fld! = %d\n", rc);
- GOTO(out, rc);
- }
- } else {
+ if (rc != 0) {
CERROR("%s: File \"%s\" is not an index: rc = %d!\n",
fld->lsf_name, fld_index_name, rc);
GOTO(out, rc);
if (rc < 0)
GOTO(out_it_fini, rc);
- do {
- rc = iops->rec(env, it, (struct dt_rec *)range, 0);
- if (rc != 0)
- GOTO(out_it_fini, rc);
-
- LASSERT(range != NULL);
- range_be_to_cpu(range, range);
- rc = fld_cache_insert(fld->lsf_cache, range);
- if (rc != 0)
- GOTO(out_it_fini, rc);
- rc = iops->next(env, it);
+ if (rc > 0) {
+ /* Load FLD entry into server cache */
+ do {
+ rc = iops->rec(env, it, (struct dt_rec *)range, 0);
+ if (rc != 0)
+ GOTO(out_it_put, rc);
+ LASSERT(range != NULL);
+ range_be_to_cpu(range, range);
+ rc = fld_cache_insert(fld->lsf_cache, range);
+ if (rc != 0)
+ GOTO(out_it_put, rc);
+ rc = iops->next(env, it);
+ } while (rc == 0);
+ }
- } while (rc == 0);
- rc = 0;
+ /* Note: fld_insert_entry will detect whether these
+ * special entries already exist inside FLDB */
+ mutex_lock(&fld->lsf_lock);
+ rc = fld_insert_special_entries(env, fld);
+ mutex_unlock(&fld->lsf_lock);
+ if (rc != 0) {
+ CERROR("%s: insert special entries failed!: rc = %d\n",
+ fld->lsf_name, rc);
+ GOTO(out_it_put, rc);
+ }
+out_it_put:
+ iops->put(env, it);
out_it_fini:
iops->fini(env, it);
out:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff