LU-6401 headers: Create single .h for lu_seq_range

[fs/lustre-release.git] / lustre / fld / fld_index.c

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index 48b00d0..4226438 100644 (file)
--- 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 <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>
@@ -108,7 +103,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);
        }
 
@@ -121,7 +116,7 @@ int fld_declare_index_create(const struct lu_env *env,
        /* 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);
@@ -187,11 +182,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;
@@ -203,7 +197,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, 1);
        if (rc != 0) {
                CERROR("%s: insert range "DRANGE" failed: rc = %d\n",
                       fld->lsf_name, PRANGE(new_range), rc);
@@ -250,11 +244,11 @@ int fld_index_lookup(const struct lu_env *env, struct lu_server_fld *fld,
 
        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",
@@ -390,7 +384,7 @@ 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));
 
@@ -475,7 +469,7 @@ int fld_server_read(const struct lu_env *env, struct lu_server_fld *fld,
 
        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));