LU-5478 style: get rid of seqno_t and mdsno_t typedefs

[fs/lustre-release.git] / lustre / mdt / mdt_capa.c

diff --git a/lustre/mdt/mdt_capa.c b/lustre/mdt/mdt_capa.c
index 4f6a44c..e1c52ee 100644 (file)
--- a/lustre/mdt/mdt_capa.c
+++ b/lustre/mdt/mdt_capa.c
@@ -49,8 +49,7 @@ static inline void set_capa_key_expiry(struct mdt_device *mdt)
        mdt->mdt_ck_expiry = jiffies + mdt->mdt_ck_timeout * HZ;
 }
 
-static void make_capa_key(struct lustre_capa_key *key,
-                          mdsno_t mdsnum, int keyid)
+static void make_capa_key(struct lustre_capa_key *key, u32 mdsnum, int keyid)
 {
         key->lk_seq = mdsnum;
         key->lk_keyid = keyid + 1;
@@ -91,7 +90,8 @@ static int write_capa_keys(const struct lu_env *env,
                RETURN(PTR_ERR(th));
 
        rc = dt_declare_record_write(env, mdt->mdt_ck_obj,
-                                    sizeof(*tmp) * 3, 0, th);
+                                    mdt_buf_const(env, NULL,
+                                    sizeof(*tmp) * 3), 0, th);
        if (rc)
                goto stop;
 
@@ -149,7 +149,7 @@ int mdt_capa_keys_init(const struct lu_env *env, struct mdt_device *mdt)
         struct mdt_thread_info  *mti;
         struct dt_object        *obj;
         struct lu_attr          *la;
-        mdsno_t                  mdsnum;
+       u32                      mdsnum;
         unsigned long            size;
         int                      rc;
         ENTRY;
@@ -214,7 +214,7 @@ static int mdt_ck_thread_main(void *args)
        struct mdt_thread_info *info;
        struct md_device       *next;
        struct l_wait_info      lwi = { 0 };
-       mdsno_t                 mdsnum;
+       u32                     mdsnum;
        int                     rc;
        ENTRY;
 
@@ -291,7 +291,7 @@ static int mdt_ck_thread_main(void *args)
 int mdt_ck_thread_start(struct mdt_device *mdt)
 {
        struct ptlrpc_thread *thread = &mdt->mdt_ck_thread;
-       cfs_task_t *task;
+       struct task_struct *task;
 
        init_waitqueue_head(&thread->t_ctl_waitq);
        task = kthread_run(mdt_ck_thread_main, mdt, "mdt_ck");