remove "lu_context *" parameter from dtc_txn_commit()

diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index 03ea95b..0fdc728 100644 (file)
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -390,8 +390,7 @@ struct dt_txn_callback {
         int (*dtc_txn_stop)(const struct lu_context *ctx,
                             struct dt_device *dev,
                             struct thandle *txn, void *cookie);
-        int (*dtc_txn_commit)(const struct lu_context *ctx,
-                              struct dt_device *dev,
+        int (*dtc_txn_commit)(struct dt_device *dev,
                               struct thandle *txn, void *cookie);
         void            *dtc_cookie;
         struct list_head dtc_linkage;
@@ -404,8 +403,7 @@ int dt_txn_hook_start(const struct lu_context *ctx,
                       struct dt_device *dev, struct txn_param *param);
 int dt_txn_hook_stop(const struct lu_context *ctx,
                      struct dt_device *dev, struct thandle *txn);
-int dt_txn_hook_commit(const struct lu_context *ctx,
-                       struct dt_device *dev, struct thandle *txn);
+int dt_txn_hook_commit(struct dt_device *dev, struct thandle *txn);
 
 int dt_try_as_dir(const struct lu_context *ctx, struct dt_object *obj);
 struct dt_object *dt_store_open(const struct lu_context *ctx,

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index 0be6df9..962bef8 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -591,8 +591,7 @@ static int mdt_txn_stop_cb(const struct lu_context *ctx,
 }
 
 /* commit callback, need to update last_commited value */
-static int mdt_txn_commit_cb(const struct lu_context *ctx,
-                             struct dt_device *dev,
+static int mdt_txn_commit_cb(struct dt_device *dev,
                              struct thandle *txn, void *cookie)
 {
         struct mdt_device *mdt = cookie;

diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c
index 31bdd2e..e495c5a 100644 (file)
--- a/lustre/obdclass/dt_object.c
+++ b/lustre/obdclass/dt_object.c
@@ -84,8 +84,7 @@ int dt_txn_hook_stop(const struct lu_context *ctx,
 }
 EXPORT_SYMBOL(dt_txn_hook_stop);
 
-int dt_txn_hook_commit(const struct lu_context *ctx,
-                       struct dt_device *dev, struct thandle *txn)
+int dt_txn_hook_commit(struct dt_device *dev, struct thandle *txn)
 {
         int result;
         struct dt_txn_callback *cb;
@@ -94,7 +93,7 @@ int dt_txn_hook_commit(const struct lu_context *ctx,
         list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
                 if (cb->dtc_txn_commit == NULL)
                         continue;
-                result = cb->dtc_txn_commit(ctx, dev, txn, cb->dtc_cookie);
+                result = cb->dtc_txn_commit(dev, txn, cb->dtc_cookie);
                 if (result < 0)
                         break;
         }

diff --git a/lustre/osd/osd_handler.c b/lustre/osd/osd_handler.c
index c6e6c1b..e018a74 100644 (file)
--- a/lustre/osd/osd_handler.c
+++ b/lustre/osd/osd_handler.c
@@ -433,8 +433,7 @@ static void osd_trans_commit_cb(struct journal_callback *jcb, int error)
         struct osd_thandle *oh = container_of0(jcb, struct osd_thandle, ot_jcb);
         struct thandle     *th = &oh->ot_super;
 
-        /* there is no thread context available */
-        dt_txn_hook_commit(&th->th_ctx, th->th_dev, th);
+        dt_txn_hook_commit(th->th_dev, th);
 
         if (th->th_dev != NULL) {
                 lu_device_put(&th->th_dev->dd_lu_dev);

diff --git a/lustre/utils/loadmod_all.sh b/lustre/utils/loadmod_all.sh
index 4459822..c9bfcab 100755 (executable)
--- a/lustre/utils/loadmod_all.sh
+++ b/lustre/utils/loadmod_all.sh
@@ -12,7 +12,7 @@ modprobe mgs
 modprobe lov
 modprobe ptlrpc
 modprobe obdecho
-modprobe llite
+modprobe lustre
 modprobe mgc
 modprobe ldiskfs
 modprobe quotafmt_test