X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ffld%2Ffld_cache.c;h=8e4a691e74c191b1cfa48b87203b5388c110cbb3;hp=9d8c52f6babc1355360ade6899a76d518c3f782b;hb=1ecf5bd5a3bece3d615d037a332792e360b49a09;hpb=1f1d3a376d488d715dd1b0c94d5b66ea05c1e6ca diff --git a/lustre/fld/fld_cache.c b/lustre/fld/fld_cache.c index 9d8c52f..8e4a691 100644 --- a/lustre/fld/fld_cache.c +++ b/lustre/fld/fld_cache.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) 2012, 2013, Intel Corporation. + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -142,12 +142,12 @@ static void fld_fix_new_list(struct fld_cache *cache) restart_fixup: list_for_each_entry_safe(f_curr, f_next, head, fce_list) { - c_range = &f_curr->fce_range; - n_range = &f_next->fce_range; + c_range = &f_curr->fce_range; + n_range = &f_next->fce_range; - LASSERT(range_is_sane(c_range)); - if (&f_next->fce_list == head) - break; + LASSERT(lu_seq_range_is_sane(c_range)); + if (&f_next->fce_list == head) + break; if (c_range->lsr_flags != n_range->lsr_flags) continue; @@ -369,7 +369,7 @@ struct fld_cache_entry { struct fld_cache_entry *f_new; - LASSERT(range_is_sane(range)); + LASSERT(lu_seq_range_is_sane(range)); OBD_ALLOC_PTR(f_new); if (!f_new) @@ -545,10 +545,10 @@ int fld_cache_lookup(struct fld_cache *cache, } prev = flde; - if (range_within(&flde->fce_range, seq)) { - *range = flde->fce_range; + if (lu_seq_range_within(&flde->fce_range, seq)) { + *range = flde->fce_range; - cache->fci_stat.fst_cache++; + cache->fci_stat.fst_cache++; read_unlock(&cache->fci_lock); RETURN(0); }