*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#define DEBUG_SUBSYSTEM S_FLD
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/module.h>
-#else /* __KERNEL__ */
-# include <liblustre.h>
-#endif
-
+#include <libcfs/libcfs.h>
+#include <linux/module.h>
#include <obd_support.h>
#include <dt_object.h>
#include <lustre_fid.h>
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),
+ .dif_keysize_min = sizeof(u64),
+ .dif_keysize_max = sizeof(u64),
.dif_recsize_min = sizeof(struct lu_seq_range),
.dif_recsize_max = sizeof(struct lu_seq_range),
.dif_ptrsize = 4
rc = fld_index_lookup(env, fld, new_range->lsr_start, range);
if (rc == 0) {
/* In case of duplicate entry, the location must be same */
- LASSERT((range_compare_loc(new_range, range) == 0));
+ LASSERT((lu_seq_range_compare_loc(new_range, range) == 0));
GOTO(out, rc = -EEXIST);
}
/* Check for merge case, since the fld entry can only be increamental,
* so we will only check whether it can be merged from the left. */
if (new_range->lsr_start == range->lsr_end && range->lsr_end != 0 &&
- range_compare_loc(new_range, range) == 0) {
+ lu_seq_range_compare_loc(new_range, range) == 0) {
range_cpu_to_be(tmp, range);
rc = dt_declare_delete(env, fld->lsf_obj,
(struct dt_key *)&tmp->lsr_start, th);
}
if (new_range->lsr_start == range->lsr_end && range->lsr_end != 0 &&
- range_compare_loc(new_range, range) == 0) {
+ lu_seq_range_compare_loc(new_range, range) == 0) {
range_cpu_to_be(tmp, range);
rc = dt_delete(env, fld->lsf_obj,
- (struct dt_key *)&tmp->lsr_start, th,
- BYPASS_CAPA);
+ (struct dt_key *)&tmp->lsr_start, th);
if (rc != 0)
GOTO(out, rc);
*tmp = *new_range;
range_cpu_to_be(tmp, tmp);
rc = dt_insert(env, fld->lsf_obj, (struct dt_rec *)tmp,
- (struct dt_key *)&tmp->lsr_start, th, BYPASS_CAPA, 1);
+ (struct dt_key *)&tmp->lsr_start, th, 1);
if (rc != 0) {
CERROR("%s: insert range "DRANGE" failed: rc = %d\n",
fld->lsf_name, PRANGE(new_range), rc);
* \retval -ve other error;
*/
int fld_index_lookup(const struct lu_env *env, struct lu_server_fld *fld,
- seqno_t seq, struct lu_seq_range *range)
+ u64 seq, struct lu_seq_range *range)
{
struct lu_seq_range *fld_rec;
struct fld_thread_info *info;
rc = fld_cache_lookup(fld->lsf_cache, seq, fld_rec);
if (rc == 0) {
- *range = *fld_rec;
- if (range_within(range, seq))
- rc = 0;
- else
- rc = -ENOENT;
+ *range = *fld_rec;
+ if (lu_seq_range_within(range, seq))
+ rc = 0;
+ else
+ rc = -ENOENT;
}
- CDEBUG(D_INFO, "%s: lookup seq = "LPX64" range : "DRANGE" rc = %d\n",
+ CDEBUG(D_INFO, "%s: lookup seq = %#llx range : "DRANGE" rc = %d\n",
fld->lsf_name, seq, PRANGE(range), rc);
RETURN(rc);
const struct lu_seq_range *range)
{
struct thandle *th;
+ struct dt_device *dt = lu2dt_dev(fld->lsf_obj->do_lu.lo_dev);
int rc;
ENTRY;
LASSERT(mutex_is_locked(&fld->lsf_lock));
- th = dt_trans_create(env, lu2dt_dev(fld->lsf_obj->do_lu.lo_dev));
+ if (dt->dd_rdonly)
+ RETURN(0);
+
+ th = dt_trans_create(env, dt);
if (IS_ERR(th))
RETURN(PTR_ERR(th));
GOTO(out, rc);
}
- rc = dt_trans_start_local(env, lu2dt_dev(fld->lsf_obj->do_lu.lo_dev),
- th);
+ rc = dt_trans_start_local(env, dt, th);
if (rc)
GOTO(out, rc);
if (rc == -EEXIST)
rc = 0;
out:
- dt_trans_stop(env, lu2dt_dev(fld->lsf_obj->do_lu.lo_dev), th);
+ dt_trans_stop(env, dt, th);
RETURN(rc);
}
EXPORT_SYMBOL(fld_insert_entry);
const struct dt_it_ops *iops;
int rc;
__u32 index;
+ int range_count = 0;
ENTRY;
info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
LASSERT(dt_obj != NULL);
if (!dt_object_exists(dt_obj)) {
- lu_object_put(env, &dt_obj->do_lu);
+ dt_object_put(env, dt_obj);
dt_obj = dt_find_or_create(env, dt, &fid, &dof, attr);
fld->lsf_new = 1;
if (IS_ERR(dt_obj)) {
range = &info->fti_rec;
/* Load fld entry to cache */
iops = &dt_obj->do_index_ops->dio_it;
- it = iops->init(env, dt_obj, 0, NULL);
+ it = iops->init(env, dt_obj, 0);
if (IS_ERR(it))
GOTO(out, rc = PTR_ERR(it));
rc = iops->load(env, it, 0);
+ if (rc > 0)
+ rc = 0;
+ else if (rc == 0)
+ rc = iops->next(env, it);
+
if (rc < 0)
GOTO(out_it_fini, rc);
- 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);
+ while (rc == 0) {
+ rc = iops->rec(env, it, (struct dt_rec *)range, 0);
+ if (rc != 0)
+ GOTO(out_it_put, rc);
+
+ range_be_to_cpu(range, range);
+
+ /* Newly created ldiskfs IAM indexes may include a
+ * zeroed-out key and record. Ignore it here. */
+ if (range->lsr_start < range->lsr_end) {
rc = fld_cache_insert(fld->lsf_cache, range);
if (rc != 0)
GOTO(out_it_put, rc);
- rc = iops->next(env, it);
- } while (rc == 0);
- } else {
- fld->lsf_new = 1;
+
+ range_count++;
+ }
+
+ rc = iops->next(env, it);
+ if (rc < 0)
+ GOTO(out_it_fini, rc);
}
+ if (range_count == 0)
+ fld->lsf_new = 1;
+
rc = fld_name_to_index(fld->lsf_name, &index);
if (rc < 0)
GOTO(out_it_put, rc);
if (rc < 0) {
if (dt_obj != NULL)
- lu_object_put(env, &dt_obj->do_lu);
+ dt_object_put(env, dt_obj);
fld->lsf_obj = NULL;
}
RETURN(rc);
ENTRY;
if (fld->lsf_obj != NULL) {
if (!IS_ERR(fld->lsf_obj))
- lu_object_put(env, &fld->lsf_obj->do_lu);
+ dt_object_put(env, fld->lsf_obj);
fld->lsf_obj = NULL;
}
EXIT;
lsra->lsra_count = 0;
iops = &dt_obj->do_index_ops->dio_it;
- it = iops->init(env, dt_obj, 0, NULL);
+ it = iops->init(env, dt_obj, 0);
if (IS_ERR(it))
RETURN(PTR_ERR(it));
git://git.whamcloud.com / fs / lustre-release.git / blobdiff