don't hijack any field in mdt_body as return value.

instead don't set OBD_MD_FLOSSCAPA in reply can work.

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 359197a..2488c55 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -1619,8 +1619,7 @@ static int mdc_interpret_renew_capa(struct ptlrpc_request *req, void *unused,
         ENTRY;
 
         if (status) {
-                DEBUG_CAPA(status == -ENOENT ? D_SEC : D_ERROR, &oc->c_capa,
-                           "renew failed: %d for", status);
+                DEBUG_CAPA(D_ERROR, &oc->c_capa, "renew failed: %d", status);
                 GOTO(out, capa = ERR_PTR(status));
         }
 
@@ -1629,11 +1628,8 @@ static int mdc_interpret_renew_capa(struct ptlrpc_request *req, void *unused,
         if (body == NULL)
                 GOTO(out, capa = ERR_PTR(-EFAULT));
 
-        if (body->flags)
-                GOTO(out, capa = ERR_PTR(-(long)body->flags));
-
         if ((body->valid & OBD_MD_FLOSSCAPA) == 0)
-                GOTO(out, capa = ERR_PTR(-EFAULT));
+                GOTO(out, capa = ERR_PTR(-ENOENT));
 
         capa = lustre_unpack_capa(req->rq_repmsg, REPLY_REC_OFF + 1);
         if (!capa)

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 95dc262..f11eed9 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -432,40 +432,28 @@ static int mdt_renew_capa(struct mdt_thread_info *info)
         int rc;
         ENTRY;
 
+        /* if object doesn't exist, or server has disabled capability,
+         * return directly, client will find body->valid OBD_MD_FLOSSCAPA
+         * flag not set.
+         */
+        if (!obj || !mdt->mdt_opts.mo_mds_capa)
+                RETURN(0);
+
         body = req_capsule_server_get(&info->mti_pill, &RMF_MDT_BODY);
         LASSERT(body != NULL);
 
-        /* NB: see mdt_unpack_req_pack_rep */
-        if (!obj)
-                GOTO(out, rc = -ENOENT);
-
         c = req_capsule_client_get(&info->mti_pill, &RMF_CAPA1);
         LASSERT(c);
 
-        if (!mdt->mdt_opts.mo_mds_capa) {
-                DEBUG_CAPA(D_SEC, c,
-                           "mds has disabled capability, skip renew for");
-                GOTO(out, rc = -ENOENT);
-        }
-
         capa = req_capsule_server_get(&info->mti_pill, &RMF_CAPA1);
         LASSERT(capa);
 
         *capa = *c;
         rc = mo_capa_get(info->mti_env, mdt_object_child(obj), capa, 1);
-        if (rc)
-                GOTO(out, rc);
+        if (rc == 0)
+                body->valid |= OBD_MD_FLOSSCAPA;
 
-        body->valid |= OBD_MD_FLOSSCAPA;
-        EXIT;
-out:
-        /* NB: capability renewal might fail because object has been removed,
-         * or server has disabled capability, but this is not error, llite
-         * will handle this internally, see mdc_interpret_renew_capa.
-         * body->flags is borrowed to store errno.
-         */
-        body->flags = (__u32)-rc;
-        return 0;
+        RETURN(rc);
 }
 
 static int mdt_getattr(struct mdt_thread_info *info)