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 10377ba..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 */
@@ -336,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 {