LU-6142 lustre: use BIT() macro where appropriate in include

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

diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h
index dfb3dcc..e16e5bc 100644 (file)
--- a/lustre/include/lu_target.h
+++ b/lustre/include/lu_target.h
@@ -97,8 +97,9 @@ struct target_distribute_txn_data {
        struct list_head        tdtd_list;
 
        /* Threads to manage distribute transaction */
-       wait_queue_head_t       tdtd_commit_thread_waitq;
+       struct task_struct      *tdtd_commit_task;
        atomic_t                tdtd_refcount;
+       struct lu_env           tdtd_env;
 
        /* recovery update */
        distribute_txn_replay_handler_t tdtd_replay_handler;
@@ -157,7 +158,6 @@ struct lu_target {
        struct dt_device_param   lut_dt_conf;
 
        struct target_distribute_txn_data *lut_tdtd;
-       struct ptlrpc_thread    lut_tdtd_commit_thread;
 
        /* supported opcodes and handlers for this target */
        struct tgt_opc_slice    *lut_slice;
@@ -171,7 +171,9 @@ struct lu_target {
        unsigned int             lut_syncjournal:1,
                                 lut_sync_lock_cancel:2,
                                 /* e.g. OST node */
-                                lut_no_reconstruct:1;
+                                lut_no_reconstruct:1,
+                                /* enforce recovery for local clients */
+                                lut_local_recovery:1;
        /** last_rcvd file */
        struct dt_object        *lut_last_rcvd;
        /* transaction callbacks */
@@ -220,6 +222,8 @@ struct lu_target {
 #define LUT_REPLY_SLOTS_PER_CHUNK (1<<20)
 #define LUT_REPLY_SLOTS_MAX_CHUNKS 16
 
+#define TRD_INDEX_MEMORY -1
+
 /**
  * Target reply data
  */
@@ -334,21 +338,21 @@ enum tgt_handler_flags {
         * struct *_body is passed in the incoming message, and object
         * identified by this fid exists on disk.
         */
-       HAS_BODY = (1 << 0),
+       HAS_BODY        = BIT(0),
        /*
         * struct ldlm_request is passed in the incoming message.
         */
-       HAS_KEY = (1 << 1),
+       HAS_KEY         = BIT(1),
        /*
         * this request has fixed reply format, so that reply message can be
         * packed by generic code.
         */
-       HAS_REPLY = (1 << 2),
+       HAS_REPLY       = BIT(2),
        /*
         * this request will modify something, so check whether the file system
         * is readonly or not, then return -EROFS to client asap if necessary.
         */
-       IS_MUTABLE = (1 << 3)
+       IS_MUTABLE      = BIT(3)
 };
 
 struct tgt_handler {
@@ -455,7 +459,7 @@ void tgt_register_lfsck_query(int (*query)(const struct lu_env *,
                                           struct lfsck_request *,
                                           struct lfsck_reply *,
                                           struct lfsck_query *));
-bool req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd);
+int req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd);
 
 extern struct tgt_handler tgt_sec_ctx_handlers[];
 extern struct tgt_handler tgt_lfsck_handlers[];
@@ -493,10 +497,11 @@ int tgt_client_new(const struct lu_env *env, struct obd_export *exp);
 int tgt_server_data_update(const struct lu_env *env, struct lu_target *tg,
                           int sync);
 int tgt_reply_data_init(const struct lu_env *env, struct lu_target *tgt);
-bool tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd);
-int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
-                      struct tg_export_data *ted, struct tg_reply_data *trd,
-                      struct thandle *th, bool update_lrd_file);
+int tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd);
+int tgt_mk_reply_data(const struct lu_env *env, struct lu_target *tgt,
+                     struct tg_export_data *ted, struct ptlrpc_request *req,
+                     __u64 opdata, struct thandle *th, bool write_update,
+                     __u64 transno);
 struct tg_reply_data *tgt_lookup_reply_by_xid(struct tg_export_data *ted,
                                               __u64 xid);
 int tgt_tunables_init(struct lu_target *lut);
@@ -530,13 +535,23 @@ long tgt_grant_create(const struct lu_env *env, struct obd_export *exp,
 int tgt_statfs_internal(const struct lu_env *env, struct lu_target *lut,
                        struct obd_statfs *osfs, time64_t max_age,
                        int *from_cache);
-int tgt_tot_dirty_seq_show(struct seq_file *m, void *data);
-int tgt_tot_granted_seq_show(struct seq_file *m, void *data);
-int tgt_tot_pending_seq_show(struct seq_file *m, void *data);
-int tgt_grant_compat_disable_seq_show(struct seq_file *m, void *data);
-ssize_t tgt_grant_compat_disable_seq_write(struct file *file,
-                                          const char __user *buffer,
-                                          size_t count, loff_t *off);
+ssize_t tot_dirty_show(struct kobject *kobj, struct attribute *attr,
+                      char *buf);
+ssize_t tot_granted_show(struct kobject *kobj, struct attribute *attr,
+                        char *buf);
+ssize_t tot_pending_show(struct kobject *kobj, struct attribute *attr,
+                        char *buf);
+ssize_t grant_compat_disable_show(struct kobject *kobj, struct attribute *attr,
+                                 char *buf);
+ssize_t grant_compat_disable_store(struct kobject *kobj,
+                                  struct attribute *attr,
+                                  const char *buffer, size_t count);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 16, 53, 0)
+ssize_t sync_lock_cancel_show(struct kobject *kobj,
+                             struct attribute *attr, char *buf);
+ssize_t sync_lock_cancel_store(struct kobject *kobj, struct attribute *attr,
+                              const char *buffer, size_t count);
+#endif
 
 /* FMD */
 void tgt_fmd_update(struct obd_export *exp, const struct lu_fid *fid,