X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Ffld_index.c;h=0c1bcf2a5299adef6dfd83e2b9c3913e31a5be44;hb=e703700e9c095d94996d7bfd957f57285d659fbf;hp=db7b60da590358f3e04400852bb3b23bad72f056;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c index db7b60d..0c1bcf2 100644 --- a/lustre/fld/fld_index.c +++ b/lustre/fld/fld_index.c @@ -15,11 +15,7 @@ * * 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 */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2014, Intel Corporation. + * Copyright (c) 2011, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -81,17 +77,15 @@ static const struct dt_index_features fld_index_features = { .dif_ptrsize = 4 }; -extern struct lu_context_key fld_thread_key; - int fld_declare_index_create(const struct lu_env *env, struct lu_server_fld *fld, const struct lu_seq_range *new_range, struct thandle *th) { - struct lu_seq_range *tmp; - struct lu_seq_range *range; - struct fld_thread_info *info; - int rc = 0; + struct lu_seq_range *tmp; + struct lu_seq_range *range; + struct fld_thread_info *info; + int rc = 0; ENTRY; @@ -103,7 +97,7 @@ int fld_declare_index_create(const struct lu_env *env, 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); } @@ -113,10 +107,12 @@ int fld_declare_index_create(const struct lu_env *env, GOTO(out, rc); } - /* 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. */ + /* + * 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); @@ -160,12 +156,13 @@ out: int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld, const struct lu_seq_range *new_range, struct thandle *th) { - struct lu_seq_range *range; - struct lu_seq_range *tmp; - struct fld_thread_info *info; - int rc = 0; - int deleted = 0; - struct fld_cache_entry *flde; + struct lu_seq_range *range; + struct lu_seq_range *tmp; + struct fld_thread_info *info; + int rc = 0; + int deleted = 0; + struct fld_cache_entry *flde; + ENTRY; info = lu_context_key_get(&env->le_ctx, &fld_thread_key); @@ -182,11 +179,10 @@ int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld, } 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; @@ -198,7 +194,7 @@ int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld, 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); if (rc != 0) { CERROR("%s: insert range "DRANGE" failed: rc = %d\n", fld->lsf_name, PRANGE(new_range), rc); @@ -234,28 +230,28 @@ out: int fld_index_lookup(const struct lu_env *env, struct lu_server_fld *fld, u64 seq, struct lu_seq_range *range) { - struct lu_seq_range *fld_rec; - struct fld_thread_info *info; - int rc; + struct lu_seq_range *fld_rec; + struct fld_thread_info *info; + int rc; - ENTRY; + ENTRY; info = lu_context_key_get(&env->le_ctx, &fld_thread_key); fld_rec = &info->fti_rec; 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", - fld->lsf_name, seq, PRANGE(range), rc); + CDEBUG(D_INFO, "%s: lookup seq = %#llx range : "DRANGE" rc = %d\n", + fld->lsf_name, seq, PRANGE(range), rc); - RETURN(rc); + RETURN(rc); } /** @@ -276,12 +272,17 @@ int fld_insert_entry(const struct lu_env *env, 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)); @@ -292,8 +293,7 @@ int fld_insert_entry(const struct lu_env *env, 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); @@ -301,7 +301,7 @@ int fld_insert_entry(const struct lu_env *env, 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); @@ -327,16 +327,18 @@ static int fld_insert_special_entries(const struct lu_env *env, int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, struct dt_device *dt, int type) { - struct dt_object *dt_obj = NULL; - struct lu_fid fid; - struct lu_attr *attr = NULL; - struct lu_seq_range *range = NULL; - struct fld_thread_info *info; - struct dt_object_format dof; - struct dt_it *it; - const struct dt_it_ops *iops; - int rc; - __u32 index; + struct dt_object *dt_obj = NULL; + struct lu_fid fid; + struct lu_attr *attr = NULL; + struct lu_seq_range *range = NULL; + struct fld_thread_info *info; + struct dt_object_format dof; + struct dt_it *it; + 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); @@ -344,7 +346,7 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, lu_local_obj_fid(&fid, FLD_INDEX_OID); OBD_ALLOC_PTR(attr); - if (attr == NULL) + if (!attr) RETURN(-ENOMEM); memset(attr, 0, sizeof(*attr)); @@ -362,7 +364,7 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, 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)) { @@ -385,31 +387,46 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, 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); @@ -417,8 +434,10 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, rc = 0; if (index == 0 && type == LU_SEQ_RANGE_MDT) { - /* Note: fld_insert_entry will detect whether these - * special entries already exist inside FLDB */ + /* + * 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); @@ -433,12 +452,12 @@ out_it_put: out_it_fini: iops->fini(env, it); out: - if (attr != NULL) + if (attr) OBD_FREE_PTR(attr); if (rc < 0) { - if (dt_obj != NULL) - lu_object_put(env, &dt_obj->do_lu); + if (dt_obj) + dt_object_put(env, dt_obj); fld->lsf_obj = NULL; } RETURN(rc); @@ -447,9 +466,9 @@ out: void fld_index_fini(const struct lu_env *env, struct lu_server_fld *fld) { ENTRY; - if (fld->lsf_obj != NULL) { + if (fld->lsf_obj) { 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; @@ -459,18 +478,18 @@ int fld_server_read(const struct lu_env *env, struct lu_server_fld *fld, struct lu_seq_range *range, void *data, int data_len) { struct lu_seq_range_array *lsra = data; - struct fld_thread_info *info; - struct dt_object *dt_obj = fld->lsf_obj; - struct lu_seq_range *entry; - struct dt_it *it; - const struct dt_it_ops *iops; - int rc; + struct fld_thread_info *info; + struct dt_object *dt_obj = fld->lsf_obj; + struct lu_seq_range *entry; + struct dt_it *it; + const struct dt_it_ops *iops; + int rc; ENTRY; 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));