LU-1222 ldlm: Fix the race in AST sender vs multiple arriving RPCs

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

diff --git a/lustre/fld/fld_index.c b/lustre/fld/fld_index.c
index dd7b1de..e7f2a21 100644 (file)
--- a/lustre/fld/fld_index.c
+++ b/lustre/fld/fld_index.c
@@ -28,6 +28,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -112,19 +114,24 @@ static struct dt_rec *fld_rec(const struct lu_env *env,
         RETURN((void *)rec);
 }
 
-struct thandle* fld_trans_start(struct lu_server_fld *fld,
-                                const struct lu_env *env, int credit)
+struct thandle *fld_trans_create(struct lu_server_fld *fld,
+                                const struct lu_env *env)
 {
-        struct fld_thread_info *info;
         struct dt_device *dt_dev;
-        struct txn_param *p;
 
         dt_dev = lu2dt_dev(fld->lsf_obj->do_lu.lo_dev);
-        info = lu_context_key_get(&env->le_ctx, &fld_thread_key);
-        p = &info->fti_txn_param;
-        txn_param_init(p, credit);
 
-        return dt_dev->dd_ops->dt_trans_start(env, dt_dev, p);
+        return dt_dev->dd_ops->dt_trans_create(env, dt_dev);
+}
+
+int fld_trans_start(struct lu_server_fld *fld,
+                                const struct lu_env *env, struct thandle *th)
+{
+        struct dt_device *dt_dev;
+
+        dt_dev = lu2dt_dev(fld->lsf_obj->do_lu.lo_dev);
+
+        return dt_dev->dd_ops->dt_trans_start(env, dt_dev, th);
 }
 
 void fld_trans_stop(struct lu_server_fld *fld,
@@ -136,6 +143,26 @@ void fld_trans_stop(struct lu_server_fld *fld,
         dt_dev->dd_ops->dt_trans_stop(env, th);
 }
 
+int fld_declare_index_create(struct lu_server_fld *fld,
+                             const struct lu_env *env,
+                             const struct lu_seq_range *range,
+                             struct thandle *th)
+{
+        struct dt_object *dt_obj = fld->lsf_obj;
+        seqno_t start;
+        int rc;
+
+        ENTRY;
+
+        start = range->lsr_start;
+        LASSERT(range_is_sane(range));
+
+        rc = dt_obj->do_index_ops->dio_declare_insert(env, dt_obj,
+                                                      fld_rec(env, range),
+                                                      fld_key(env, start), th);
+        RETURN(rc);
+}
+
 /**
  * insert range in fld store.
  *
@@ -153,7 +180,6 @@ int fld_index_create(struct lu_server_fld *fld,
                      struct thandle *th)
 {
         struct dt_object *dt_obj = fld->lsf_obj;
-        struct dt_device *dt_dev;
         seqno_t start;
         int rc;
 
@@ -161,7 +187,6 @@ int fld_index_create(struct lu_server_fld *fld,
 
         start = range->lsr_start;
         LASSERT(range_is_sane(range));
-        dt_dev = lu2dt_dev(fld->lsf_obj->do_lu.lo_dev);
 
         rc = dt_obj->do_index_ops->dio_insert(env, dt_obj,
                                               fld_rec(env, range),
@@ -189,16 +214,13 @@ int fld_index_delete(struct lu_server_fld *fld,
                      struct thandle   *th)
 {
         struct dt_object *dt_obj = fld->lsf_obj;
-        struct dt_device *dt_dev;
         seqno_t seq = range->lsr_start;
         int rc;
 
         ENTRY;
 
-        dt_dev = lu2dt_dev(fld->lsf_obj->do_lu.lo_dev);
-        rc = dt_obj->do_index_ops->dio_delete(env, dt_obj,
-                                              fld_key(env, seq), th,
-                                              BYPASS_CAPA);
+        rc = dt_obj->do_index_ops->dio_delete(env, dt_obj, fld_key(env, seq),
+                                              th, BYPASS_CAPA);
 
         CDEBUG(D_INFO, "%s: delete given range : "DRANGE" rc = %d\n",
                fld->lsf_name, PRANGE(range), rc);
@@ -258,11 +280,22 @@ static int fld_insert_igif_fld(struct lu_server_fld *fld,
 {
         struct thandle *th;
         int rc;
-
         ENTRY;
-        th = fld_trans_start(fld, env, FLD_TXN_INDEX_INSERT_CREDITS);
+
+        /* FLD_TXN_INDEX_INSERT_CREDITS */
+        th = fld_trans_create(fld, env);
         if (IS_ERR(th))
                 RETURN(PTR_ERR(th));
+        rc = fld_declare_index_create(fld, env, &IGIF_FLD_RANGE, th);
+        if (rc) {
+                fld_trans_stop(fld, env, th);
+                RETURN(rc);
+        }
+        rc = fld_trans_start(fld, env, th);
+        if (rc) {
+                fld_trans_stop(fld, env, th);
+                RETURN(rc);
+        }
 
         rc = fld_index_create(fld, env, &IGIF_FLD_RANGE, th);
         fld_trans_stop(fld, env, th);