LU-5478 osd: get rid of obd_* typedefs

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

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index bcd795e..0d04fc2 100644 (file)
--- a/lustre/fld/fld_index.c
+++ b/lustre/fld/fld_index.c
@@ -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>
@@ -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)
@@ -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));