LU-9706 dt: remove dt_txn_hook_commit()

[fs/lustre-release.git] / lustre / include / dt_object.h

diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index 130a4c4..aa8a65b 100644 (file)
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2016, Intel Corporation.
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -84,7 +84,10 @@ struct dt_device_param {
        unsigned           ddp_max_extent_blks;
        /* per-extent insertion overhead to be used by client for grant
         * calculation */
-       unsigned           ddp_extent_tax;
+       unsigned int       ddp_extent_tax;
+       unsigned int       ddp_brw_size;        /* optimal RPC size */
+       /* T10PI checksum type, zero if not supported */
+       enum cksum_types   ddp_t10_cksum_type;
 };
 
 /**
@@ -1136,7 +1139,6 @@ struct dt_body_operations {
         * \param[in] pos       position in the object to start
         * \param[out] pos      \a pos + bytes written
         * \param[in] th        transaction handle
-        * \param[in] ignore    unused (was used to request quota ignorance)
         *
         * \retval positive     bytes written on success
         * \retval negative     negated errno on error
@@ -1145,8 +1147,7 @@ struct dt_body_operations {
                             struct dt_object *dt,
                             const struct lu_buf *buf,
                             loff_t *pos,
-                            struct thandle *th,
-                            int ignore);
+                            struct thandle *th);
 
        /**
         * Return buffers for data.
@@ -1479,7 +1480,6 @@ struct dt_index_operations {
         * \param[in] rec       buffer storing value
         * \param[in] key       key
         * \param[in] th        transaction handle
-        * \param[in] ignore    unused (was used to request quota ignorance)
         *
         * \retval 0            on success
         * \retval negative     negated errno on error
@@ -1488,8 +1488,7 @@ struct dt_index_operations {
                          struct dt_object *dt,
                          const struct dt_rec *rec,
                          const struct dt_key *key,
-                         struct thandle *th,
-                         int ignore);
+                         struct thandle *th);
 
        /**
         * Declare intention to delete a key/value from an index.
@@ -1782,6 +1781,14 @@ struct dt_device {
        struct list_head                   dd_txn_callbacks;
        unsigned int                       dd_record_fid_accessed:1,
                                           dd_rdonly:1;
+
+       /* sysfs and debugfs handling */
+       struct dentry                     *dd_debugfs_entry;
+
+       const struct attribute           **dd_def_attrs;
+       struct kobject                     dd_kobj;
+       struct kobj_type                   dd_ktype;
+       struct completion                  dd_kobj_unregister;
 };
 
 int  dt_device_init(struct dt_device *dev, struct lu_device_type *t);
@@ -1900,7 +1907,9 @@ struct thandle {
                                th_wait_submit:1,
        /* complex transaction which will track updates on all targets,
         * including OSTs */
-                               th_complex:1;
+                               th_complex:1,
+       /* whether ignore quota */
+                               th_ignore_quota:1;
 };
 
 /**
@@ -1919,7 +1928,6 @@ struct dt_txn_callback {
                              struct thandle *txn, void *cookie);
         int (*dtc_txn_stop)(const struct lu_env *env,
                             struct thandle *txn, void *cookie);
-        void (*dtc_txn_commit)(struct thandle *txn, void *cookie);
        void                    *dtc_cookie;
        __u32                   dtc_tag;
        struct list_head        dtc_linkage;
@@ -1931,7 +1939,6 @@ void dt_txn_callback_del(struct dt_device *dev, struct dt_txn_callback *cb);
 int dt_txn_hook_start(const struct lu_env *env,
                       struct dt_device *dev, struct thandle *txn);
 int dt_txn_hook_stop(const struct lu_env *env, struct thandle *txn);
-void dt_txn_hook_commit(struct thandle *txn);
 
 int dt_try_as_dir(const struct lu_env *env, struct dt_object *obj);
 
@@ -2452,12 +2459,12 @@ static inline int dt_declare_write(const struct lu_env *env,
 
 static inline ssize_t dt_write(const struct lu_env *env, struct dt_object *dt,
                               const struct lu_buf *buf, loff_t *pos,
-                              struct thandle *th, int rq)
+                              struct thandle *th)
 {
        LASSERT(dt);
        LASSERT(dt->do_body_ops);
        LASSERT(dt->do_body_ops->dbo_write);
-       return dt->do_body_ops->dbo_write(env, dt, buf, pos, th, rq);
+       return dt->do_body_ops->dbo_write(env, dt, buf, pos, th);
 }
 
 static inline int dt_declare_punch(const struct lu_env *env,
@@ -2560,11 +2567,10 @@ static inline int dt_declare_insert(const struct lu_env *env,
 }
 
 static inline int dt_insert(const struct lu_env *env,
-                                    struct dt_object *dt,
-                                    const struct dt_rec *rec,
-                                    const struct dt_key *key,
-                                    struct thandle *th,
-                                    int noquota)
+                           struct dt_object *dt,
+                           const struct dt_rec *rec,
+                           const struct dt_key *key,
+                           struct thandle *th)
 {
         LASSERT(dt);
         LASSERT(dt->do_index_ops);
@@ -2573,7 +2579,7 @@ static inline int dt_insert(const struct lu_env *env,
        if (CFS_FAULT_CHECK(OBD_FAIL_DT_INSERT))
                return cfs_fail_err;
 
-       return dt->do_index_ops->dio_insert(env, dt, rec, key, th, noquota);
+       return dt->do_index_ops->dio_insert(env, dt, rec, key, th);
 }
 
 static inline int dt_declare_xattr_del(const struct lu_env *env,
@@ -2815,6 +2821,9 @@ static inline struct dt_thread_info *dt_info(const struct lu_env *env)
 
 int dt_global_init(void);
 void dt_global_fini(void);
+int dt_tunables_init(struct dt_device *dt, struct obd_type *type,
+                    const char *name, struct lprocfs_vars *list);
+int dt_tunables_fini(struct dt_device *dt);
 
 # ifdef CONFIG_PROC_FS
 int lprocfs_dt_blksize_seq_show(struct seq_file *m, void *v);