dt: 0. add txn callbacks interface; 1. pass lu_attr to ->do_object_create()

diff --git a/lustre/include/linux/dt_object.h b/lustre/include/linux/dt_object.h
index 48643a6..085516b 100644 (file)
--- a/lustre/include/linux/dt_object.h
+++ b/lustre/include/linux/dt_object.h
@@ -149,7 +149,7 @@ struct dt_object_operations {
          * postcondition: ergo(result == 0, lu_object_exists(ctxt, &dt->do_lu));
          */
         int   (*do_object_create)(struct lu_context *ctxt, struct dt_object *dt,
-                                  struct thandle *th);
+                                  struct lu_attr *attr, struct thandle *th);
         /*
          * Destroy existing object.
          *
@@ -202,8 +202,17 @@ struct dt_index_operations {
 struct dt_device {
         struct lu_device             dd_lu_dev;
         struct dt_device_operations *dd_ops;
+        /*
+         * List of dt_txn_callback (see below). This is not protected in any
+         * way, because callbacks are supposed to be added/deleted only during
+         * single-threaded start-up shut-down procedures.
+         */
+        struct list_head             dd_txn_callbacks;
 };
 
+int  dt_device_init(struct dt_device *dev, struct lu_device_type *t);
+void dt_device_fini(struct dt_device *dev);
+
 static inline int lu_device_is_dt(const struct lu_device *d)
 {
         return ergo(d != NULL, d->ld_type->ldt_tags & LU_DEVICE_DT);
@@ -236,4 +245,36 @@ struct thandle {
         struct dt_device *th_dev;
 };
 
+/*
+ * Transaction call-backs.
+ *
+ * These are invoked by osd (or underlying transaction engine) when
+ * transaction changes state.
+ *
+ * Call-backs are used by upper layers to modify transaction parameters and to
+ * perform some actions on for each transaction state transition. Typical
+ * example is mdt registering call-back to write into last-received file
+ * before each transaction commit.
+ */
+struct dt_txn_callback {
+        int (*dtc_txn_start)(struct lu_context *ctx, struct dt_device *dev,
+                             struct txn_param *param, void *cookie);
+        int (*dtc_txn_stop)(struct lu_context *ctx, struct dt_device *dev,
+                            struct thandle *txn, void *cookie);
+        int (*dtc_txn_commit)(struct lu_context *ctx, struct dt_device *dev,
+                              struct thandle *txn, void *cookie);
+        void            *dtc_cookie;
+        struct list_head dtc_linkage;
+};
+
+void dt_txn_callback_add(struct dt_device *dev, struct dt_txn_callback *cb);
+void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb);
+
+int dt_txn_hook_start(struct lu_context *ctx,
+                      struct dt_device *dev, struct txn_param *param);
+int dt_txn_hook_stop(struct lu_context *ctx,
+                     struct dt_device *dev, struct thandle *txn);
+int dt_txn_hook_commit(struct lu_context *ctx,
+                       struct dt_device *dev, struct thandle *txn);
+
 #endif /* __LINUX_DT_OBJECT_H */

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index 9e5aeb6..ea93343 100644 (file)
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -1,7 +1,7 @@
 MODULES := obdclass llog_test
 
 obdclass-objs := llog.o llog_cat.o llog_lvfs.o llog_obd.o llog_swab.o
-obdclass-objs += class_obd.o lu_object.o
+obdclass-objs += class_obd.o lu_object.o dt_object.o
 obdclass-objs += debug.o genops.o sysctl.o uuid.o llog_ioctl.o
 obdclass-objs += lprocfs_status.o lustre_handles.o lustre_peer.o
 obdclass-objs += statfs_pack.o obdo.o obd_config.o obd_mount.o mea.o prng.o

diff --git a/lustre/obdclass/dt_object.c b/lustre/obdclass/dt_object.c
new file mode 100644 (file)
index 0000000..a870e33
--- /dev/null
+++ b/lustre/obdclass/dt_object.c
@@ -0,0 +1,109 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Dt Object.
+ *
+ *  Copyright (C) 2006 Cluster File Systems, Inc.
+ *   Author: Nikita Danilov <nikita@clusterfs.com>
+ *
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
+ *
+ *   You may have signed or agreed to another license before downloading
+ *   this software.  If so, you are bound by the terms and conditions
+ *   of that agreement, and the following does not apply to you.  See the
+ *   LICENSE file included with this distribution for more information.
+ *
+ *   If you did not agree to a different license, then this copy of Lustre
+ *   is open source software; you can redistribute it and/or modify it
+ *   under the terms of version 2 of the GNU General Public License as
+ *   published by the Free Software Foundation.
+ *
+ *   In either case, Lustre is distributed in the hope that it will be
+ *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   license text for more details.
+ *
+ * Generic functions from dt_object.h
+ */
+
+#define DEBUG_SUBSYSTEM S_CLASS
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+
+#include <linux/dt_object.h>
+#include <libcfs/list.h>
+
+void dt_txn_callback_add(struct dt_device *dev, struct dt_txn_callback *cb)
+{
+        list_add(&cb->dtc_linkage, &dev->dd_txn_callbacks);
+}
+EXPORT_SYMBOL(dt_txn_callback_add);
+
+void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb)
+{
+        list_del_init(&cb->dtc_linkage);
+}
+EXPORT_SYMBOL(dt_txn_callback_del);
+
+int dt_txn_hook_start(struct lu_context *ctx,
+                      struct dt_device *dev, struct txn_param *param)
+{
+        int result;
+        struct dt_txn_callback *cb;
+
+        result = 0;
+        list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+                result = cb->dtc_txn_start(ctx, dev, param, cb->dtc_cookie);
+                if (result < 0)
+                        break;
+        }
+        return result;
+}
+EXPORT_SYMBOL(dt_txn_hook_start);
+
+int dt_txn_hook_stop(struct lu_context *ctx,
+                     struct dt_device *dev, struct thandle *txn)
+{
+        int result;
+        struct dt_txn_callback *cb;
+
+        result = 0;
+        list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+                result = cb->dtc_txn_stop(ctx, dev, txn, cb->dtc_cookie);
+                if (result < 0)
+                        break;
+        }
+        return result;
+}
+EXPORT_SYMBOL(dt_txn_hook_stop);
+
+int dt_txn_hook_commit(struct lu_context *ctx,
+                       struct dt_device *dev, struct thandle *txn)
+{
+        int result;
+        struct dt_txn_callback *cb;
+
+        result = 0;
+        list_for_each_entry(cb, &dev->dd_txn_callbacks, dtc_linkage) {
+                result = cb->dtc_txn_commit(ctx, dev, txn, cb->dtc_cookie);
+                if (result < 0)
+                        break;
+        }
+        return result;
+}
+EXPORT_SYMBOL(dt_txn_hook_commit);
+
+int dt_device_init(struct dt_device *dev, struct lu_device_type *t)
+{
+        CFS_INIT_LIST_HEAD(&dev->dd_txn_callbacks);
+        return lu_device_init(&dev->dd_lu_dev, t);
+}
+EXPORT_SYMBOL(dt_device_init);
+
+void dt_device_fini(struct dt_device *dev)
+{
+        lu_device_fini(&dev->dd_lu_dev);
+}
+EXPORT_SYMBOL(dt_device_fini);