Revert "b=19808 2.6.29-fc11 patchless client support"

[fs/lustre-release.git] / lustre / fid / fid_store.c

diff --git a/lustre/fid/fid_store.c b/lustre/fid/fid_store.c
index 7a827da..aea967b 100644 (file)
--- a/lustre/fid/fid_store.c
+++ b/lustre/fid/fid_store.c
@@ -62,9 +62,6 @@
 #include "fid_internal.h"
 
 #ifdef __KERNEL__
-enum {
-        SEQ_TXN_STORE_CREDITS = 20
-};
 
 static struct lu_buf *seq_store_buf(struct seq_thread_info *info)
 {
@@ -76,47 +73,68 @@ static struct lu_buf *seq_store_buf(struct seq_thread_info *info)
         return buf;
 }
 
+struct thandle * seq_store_trans_start(struct lu_server_seq *seq,
+                                       const struct lu_env *env, int credit)
+{
+        struct seq_thread_info *info;
+        struct dt_device *dt_dev;
+        struct thandle *th;
+        ENTRY;
+
+        dt_dev = lu2dt_dev(seq->lss_obj->do_lu.lo_dev);
+        info = lu_context_key_get(&env->le_ctx, &seq_thread_key);
+        LASSERT(info != NULL);
+
+        txn_param_init(&info->sti_txn, credit);
+
+        th = dt_dev->dd_ops->dt_trans_start(env, dt_dev, &info->sti_txn);
+        return th;
+}
+
+void seq_store_trans_stop(struct lu_server_seq *seq,
+                          const struct lu_env *env,
+                          struct thandle *th)
+{
+        struct dt_device *dt_dev;
+        ENTRY;
+
+        dt_dev = lu2dt_dev(seq->lss_obj->do_lu.lo_dev);
+
+        dt_dev->dd_ops->dt_trans_stop(env, th);
+}
+
 /* This function implies that caller takes care about locking. */
 int seq_store_write(struct lu_server_seq *seq,
-                    const struct lu_env *env)
+                    const struct lu_env *env,
+                    struct thandle *th)
 {
         struct dt_object *dt_obj = seq->lss_obj;
         struct seq_thread_info *info;
         struct dt_device *dt_dev;
-        struct thandle *th;
         loff_t pos = 0;
-       int rc;
-       ENTRY;
+        int rc;
+        ENTRY;
 
         dt_dev = lu2dt_dev(seq->lss_obj->do_lu.lo_dev);
         info = lu_context_key_get(&env->le_ctx, &seq_thread_key);
         LASSERT(info != NULL);
 
-        /* Stub here, will fix it later. */
-        txn_param_init(&info->sti_txn, SEQ_TXN_STORE_CREDITS);
+        /* Store ranges in le format. */
+        range_cpu_to_le(&info->sti_space, &seq->lss_space);
 
-        th = dt_dev->dd_ops->dt_trans_start(env, dt_dev, &info->sti_txn);
-        if (!IS_ERR(th)) {
-                /* Store ranges in le format. */
-                range_cpu_to_le(&info->sti_space, &seq->lss_space);
-
-                rc = dt_obj->do_body_ops->dbo_write(env, dt_obj,
-                                                    seq_store_buf(info),
-                                                    &pos, th, BYPASS_CAPA, 1);
-                if (rc == sizeof(info->sti_space)) {
-                        CDEBUG(D_INFO, "%s: Space - "DRANGE"\n",
-                               seq->lss_name, PRANGE(&seq->lss_space));
-                        rc = 0;
-                } else if (rc >= 0) {
-                        rc = -EIO;
-                }
-
-                dt_dev->dd_ops->dt_trans_stop(env, th);
-        } else {
-                rc = PTR_ERR(th);
+        rc = dt_obj->do_body_ops->dbo_write(env, dt_obj,
+                                            seq_store_buf(info),
+                                            &pos, th, BYPASS_CAPA, 1);
+        if (rc == sizeof(info->sti_space)) {
+                CDEBUG(D_INFO, "%s: Space - "DRANGE"\n",
+                       seq->lss_name, PRANGE(&seq->lss_space));
+                rc = 0;
+        } else if (rc >= 0) {
+                rc = -EIO;
         }
-       
-       RETURN(rc);
+
+
+        RETURN(rc);
 }
 
 /*
@@ -129,8 +147,8 @@ int seq_store_read(struct lu_server_seq *seq,
         struct dt_object *dt_obj = seq->lss_obj;
         struct seq_thread_info *info;
         loff_t pos = 0;
-       int rc;
-       ENTRY;
+        int rc;
+        ENTRY;
 
         info = lu_context_key_get(&env->le_ctx, &seq_thread_key);
         LASSERT(info != NULL);
@@ -151,7 +169,7 @@ int seq_store_read(struct lu_server_seq *seq,
                 rc = -EIO;
         }
 
-       RETURN(rc);
+        RETURN(rc);
 }
 
 int seq_store_init(struct lu_server_seq *seq,
@@ -167,13 +185,13 @@ int seq_store_init(struct lu_server_seq *seq,
         name = seq->lss_type == LUSTRE_SEQ_SERVER ?
                 LUSTRE_SEQ_SRV_NAME : LUSTRE_SEQ_CTL_NAME;
 
-        dt_obj = dt_store_open(env, dt, name, &fid);
+        dt_obj = dt_store_open(env, dt, "", name, &fid);
         if (!IS_ERR(dt_obj)) {
                 seq->lss_obj = dt_obj;
-               rc = 0;
+                rc = 0;
         } else {
                 CERROR("%s: Can't find \"%s\" obj %d\n",
-                      seq->lss_name, name, (int)PTR_ERR(dt_obj));
+                       seq->lss_name, name, (int)PTR_ERR(dt_obj));
                 rc = PTR_ERR(dt_obj);
         }