X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ffld%2Ffld_index.c;h=db7b60da590358f3e04400852bb3b23bad72f056;hb=a172863af11bcef474191ca40eaa479179457c08;hp=c9a3546d6fdd704a999f3baff6b7121939b0793f;hpb=c50a9e2ae39df781598696dae4f33d60199a84dd;p=fs%2Flustre-release.git diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c index c9a3546..db7b60d 100644 --- a/lustre/fld/fld_index.c +++ b/lustre/fld/fld_index.c @@ -27,7 +27,7 @@ * 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, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -41,13 +41,8 @@ #define DEBUG_SUBSYSTEM S_FLD -#ifdef __KERNEL__ -# include -# include -#else /* __KERNEL__ */ -# include -#endif - +#include +#include #include #include #include @@ -79,8 +74,8 @@ static const struct lu_seq_range ROOT_FLD_RANGE = { 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 @@ -159,6 +154,8 @@ out: * changed between declare and create. * Because the fld entry can only be increamental, so we will only check * whether it can be merged from the left. + * + * Caller must hold fld->lsf_lock **/ int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld, const struct lu_seq_range *new_range, struct thandle *th) @@ -173,7 +170,7 @@ int fld_index_create(const struct lu_env *env, struct lu_server_fld *fld, 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)); @@ -235,7 +232,7 @@ out: * \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; @@ -261,6 +258,19 @@ int fld_index_lookup(const struct lu_env *env, struct lu_server_fld *fld, RETURN(rc); } +/** + * insert entry in fld store. + * + * \param env relevant lu_env + * \param fld fld store + * \param range range to be inserted + * + * \retval 0 success + * \retval -ve error + * + * Caller must hold fld->lsf_lock + **/ + int fld_insert_entry(const struct lu_env *env, struct lu_server_fld *fld, const struct lu_seq_range *range) @@ -269,6 +279,8 @@ int fld_insert_entry(const struct lu_env *env, 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 (IS_ERR(th)) RETURN(PTR_ERR(th)); @@ -313,7 +325,7 @@ 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) + struct dt_device *dt, int type) { struct dt_object *dt_obj = NULL; struct lu_fid fid; @@ -324,6 +336,7 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, struct dt_it *it; const struct dt_it_ops *iops; int rc; + __u32 index; ENTRY; info = lu_context_key_get(&env->le_ctx, &fld_thread_key); @@ -340,15 +353,27 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, dof.dof_type = DFT_INDEX; dof.u.dof_idx.di_feat = &fld_index_features; - dt_obj = dt_find_or_create(env, dt, &fid, &dof, attr); + dt_obj = dt_locate(env, dt, &fid); if (IS_ERR(dt_obj)) { rc = PTR_ERR(dt_obj); - CERROR("%s: Can't find \"%s\" obj %d\n", fld->lsf_name, - fld_index_name, rc); dt_obj = NULL; GOTO(out, rc); } + LASSERT(dt_obj != NULL); + if (!dt_object_exists(dt_obj)) { + lu_object_put(env, &dt_obj->do_lu); + dt_obj = dt_find_or_create(env, dt, &fid, &dof, attr); + fld->lsf_new = 1; + if (IS_ERR(dt_obj)) { + rc = PTR_ERR(dt_obj); + CERROR("%s: Can't find \"%s\" obj %d\n", fld->lsf_name, + fld_index_name, rc); + dt_obj = NULL; + GOTO(out, rc); + } + } + fld->lsf_obj = dt_obj; rc = dt_obj->do_ops->do_index_try(env, dt_obj, &fld_index_features); if (rc != 0) { @@ -381,19 +406,28 @@ int fld_index_init(const struct lu_env *env, struct lu_server_fld *fld, GOTO(out_it_put, rc); rc = iops->next(env, it); } while (rc == 0); + } else { + fld->lsf_new = 1; } - /* 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); + rc = fld_name_to_index(fld->lsf_name, &index); + if (rc < 0) GOTO(out_it_put, rc); - } + else + rc = 0; + if (index == 0 && type == LU_SEQ_RANGE_MDT) { + /* 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: @@ -402,7 +436,7 @@ out: if (attr != NULL) OBD_FREE_PTR(attr); - if (rc != 0) { + if (rc < 0) { if (dt_obj != NULL) lu_object_put(env, &dt_obj->do_lu); fld->lsf_obj = NULL; @@ -420,3 +454,60 @@ void fld_index_fini(const struct lu_env *env, struct lu_server_fld *fld) } EXIT; } + +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; + + ENTRY; + + lsra->lsra_count = 0; + iops = &dt_obj->do_index_ops->dio_it; + it = iops->init(env, dt_obj, 0, NULL); + if (IS_ERR(it)) + RETURN(PTR_ERR(it)); + + rc = iops->load(env, it, range->lsr_end); + if (rc <= 0) + GOTO(out_it_fini, rc); + + info = lu_context_key_get(&env->le_ctx, &fld_thread_key); + LASSERT(info != NULL); + entry = &info->fti_rec; + do { + rc = iops->rec(env, it, (struct dt_rec *)entry, 0); + if (rc != 0) + GOTO(out_it_put, rc); + + if (offsetof(typeof(*lsra), lsra_lsr[lsra->lsra_count + 1]) > + data_len) + GOTO(out, rc = -EAGAIN); + + range_be_to_cpu(entry, entry); + if (entry->lsr_index == range->lsr_index && + entry->lsr_flags == range->lsr_flags && + entry->lsr_start > range->lsr_start) { + lsra->lsra_lsr[lsra->lsra_count] = *entry; + lsra->lsra_count++; + } + + rc = iops->next(env, it); + } while (rc == 0); + if (rc > 0) + rc = 0; +out: + range_array_cpu_to_le(lsra, lsra); +out_it_put: + iops->put(env, it); +out_it_fini: + iops->fini(env, it); + + RETURN(rc); +}