LU-12616 obclass: fix MDS start/stop race

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

diff --git a/lustre/mdt/mdt_lvb.c b/lustre/mdt/mdt_lvb.c
index 9ee1989..5c60471 100644 (file)
--- a/lustre/mdt/mdt_lvb.c
+++ b/lustre/mdt/mdt_lvb.c
@@ -34,7 +34,7 @@
 #include "mdt_internal.h"
 
 /* Called with res->lr_lvb_sem held */
-static int mdt_lvbo_init(const struct lu_env *env, struct ldlm_resource *res)
+static int mdt_lvbo_init(struct ldlm_resource *res)
 {
        if (IS_LQUOTA_RES(res)) {
                struct mdt_device       *mdt;
@@ -140,11 +140,11 @@ int mdt_dom_disk_lvbo_update(const struct lu_env *env, struct mdt_object *mo,
        RETURN(rc);
 }
 
-int mdt_dom_lvbo_update(const struct lu_env *env, struct ldlm_resource *res,
-                       struct ldlm_lock *lock, struct ptlrpc_request *req,
-                       bool increase_only)
+int mdt_dom_lvbo_update(struct ldlm_resource *res, struct ldlm_lock *lock,
+                       struct ptlrpc_request *req, bool increase_only)
 {
        struct obd_export *exp = lock ? lock->l_export : NULL;
+       const struct lu_env *env = lu_env_find();
        struct mdt_device *mdt;
        struct mdt_object *mo;
        struct mdt_thread_info *info;
@@ -251,9 +251,8 @@ out_env:
        return rc;
 }
 
-static int mdt_lvbo_update(const struct lu_env *env, struct ldlm_resource *res,
-                          struct ldlm_lock *lock, struct ptlrpc_request *req,
-                          int increase_only)
+static int mdt_lvbo_update(struct ldlm_resource *res, struct ldlm_lock *lock,
+                          struct ptlrpc_request *req, int increase_only)
 {
        ENTRY;
 
@@ -275,8 +274,7 @@ static int mdt_lvbo_update(const struct lu_env *env, struct ldlm_resource *res,
         * by MDT for DOM objects only.
         */
        if (lock == NULL || ldlm_has_dom(lock))
-               return mdt_dom_lvbo_update(env, res, lock, req,
-                                          !!increase_only);
+               return mdt_dom_lvbo_update(res, lock, req, !!increase_only);
        return 0;
 }
 
@@ -306,32 +304,50 @@ static int mdt_lvbo_size(struct ldlm_lock *lock)
        return 0;
 }
 
-static int mdt_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
-                        void *lvb, int lvblen)
+/**
+ * Implementation of ldlm_valblock_ops::lvbo_fill for MDT.
+ *
+ * This function is called to fill the given RPC buffer \a buf with LVB data
+ *
+ * \param[in] env              execution environment
+ * \param[in] lock             LDLM lock
+ * \param[in] buf              RPC buffer to fill
+ * \param[in,out] lvblen       lvb buffer length
+ *
+ * \retval             size of LVB data written into \a buf buffer
+ *                     or -ERANGE when the provided @lvblen is not big enough,
+ *                     and the needed lvb buffer size will be returned in
+ *                     @lvblen
+ */
+static int mdt_lvbo_fill(struct ldlm_lock *lock,
+                        void *lvb, int *lvblen)
 {
        struct mdt_thread_info *info;
        struct mdt_device *mdt;
+       struct lu_env *env;
        struct lu_fid *fid;
        struct mdt_object *obj = NULL;
        struct md_object *child = NULL;
        int rc;
        ENTRY;
 
+       env = lu_env_find();
+       LASSERT(env);
+
        mdt = ldlm_lock_to_ns(lock)->ns_lvbp;
        if (IS_LQUOTA_RES(lock->l_resource)) {
                if (mdt->mdt_qmt_dev == NULL)
-                       RETURN(0);
+                       GOTO(out, rc = 0);
 
                /* call lvbo fill function of quota master */
                rc = qmt_hdls.qmth_lvbo_fill(mdt->mdt_qmt_dev, lock, lvb,
-                                            lvblen);
-               RETURN(rc);
+                                            *lvblen);
+               GOTO(out, rc);
        }
 
        info = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
        if (!info) {
-               rc = lu_env_refill_by_tags((struct lu_env *)env,
-                                          LCT_MD_THREAD, 0);
+               rc = lu_env_refill_by_tags(env, LCT_MD_THREAD, 0);
                if (rc)
                        GOTO(out, rc);
                info = lu_context_key_get(&env->le_ctx, &mdt_thread_key);
@@ -352,11 +368,10 @@ static int mdt_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
                int lvb_len = sizeof(struct ost_lvb);
 
                if (!mdt_dom_lvb_is_valid(res))
-                       mdt_dom_lvbo_update(env, lock->l_resource,
-                                           lock, NULL, 0);
+                       mdt_dom_lvbo_update(lock->l_resource, lock, NULL, 0);
 
-               if (lvb_len > lvblen)
-                       lvb_len = lvblen;
+               if (lvb_len > *lvblen)
+                       lvb_len = *lvblen;
 
                lock_res(res);
                memcpy(lvb, res->lr_lvb_data, lvb_len);
@@ -366,7 +381,7 @@ static int mdt_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
        }
 
        /* Only fill layout if layout lock is granted */
-       if (!ldlm_has_layout(lock) || lock->l_granted_mode != lock->l_req_mode)
+       if (!ldlm_has_layout(lock) || !ldlm_is_granted(lock))
                GOTO(out, rc = 0);
 
        /* XXX get fid by resource id. why don't include fid in ldlm_resource */
@@ -388,7 +403,7 @@ static int mdt_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
                GOTO(out_put, rc);
        if (rc > 0) {
                struct lu_buf *lmm = NULL;
-               if (lvblen < rc) {
+               if (*lvblen < rc) {
                        int level;
 
                        /* The layout EA may be larger than mdt_max_mdsize
@@ -403,8 +418,9 @@ static int mdt_lvbo_fill(const struct lu_env *env, struct ldlm_lock *lock,
                        }
                        CDEBUG_LIMIT(level, "%s: small buffer size %d for EA "
                                     "%d (max_mdsize %d): rc = %d\n",
-                                    mdt_obd_name(mdt), lvblen, rc,
+                                    mdt_obd_name(mdt), *lvblen, rc,
                                     info->mti_mdt->mdt_max_mdsize, -ERANGE);
+                       *lvblen = rc;
                        GOTO(out_put, rc = -ERANGE);
                }
                lmm = &info->mti_buf;
@@ -419,7 +435,9 @@ out_put:
        if (obj != NULL && !IS_ERR(obj))
                mdt_object_put(env, obj);
 out:
-       RETURN(rc < 0 ? 0 : rc);
+       if (rc < 0 && rc != -ERANGE)
+               rc = 0;
+       RETURN(rc);
 }
 
 static int mdt_lvbo_free(struct ldlm_resource *res)