LU-12212 mdt: fix SECCTX reply buffer handling

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

diff --git a/lustre/mdt/mdt_lib.c b/lustre/mdt/mdt_lib.c
index 4cda802..a7d5130 100644 (file)
--- a/lustre/mdt/mdt_lib.c
+++ b/lustre/mdt/mdt_lib.c
@@ -681,11 +681,25 @@ void mdt_dump_lmm(int level, const struct lov_mds_md *lmm, __u64 valid)
 void mdt_dump_lmv(unsigned int level, const union lmv_mds_md *lmv)
 {
        const struct lmv_mds_md_v1 *lmm1;
+       const struct lmv_foreign_md *lfm;
        int                        i;
 
        if (likely(!cfs_cdebug_show(level, DEBUG_SUBSYSTEM)))
                return;
 
+       /* foreign LMV case */
+       lfm = &lmv->lmv_foreign_md;
+       if (le32_to_cpu(lfm->lfm_magic) == LMV_MAGIC_FOREIGN) {
+               CDEBUG_LIMIT(level,
+                            "foreign magic 0x%08X, length %u, type %u, flags %u, value '%.*s'\n",
+                            le32_to_cpu(lfm->lfm_magic),
+                            le32_to_cpu(lfm->lfm_length),
+                            le32_to_cpu(lfm->lfm_type),
+                            le32_to_cpu(lfm->lfm_flags),
+                            le32_to_cpu(lfm->lfm_length), lfm->lfm_value);
+               return;
+       }
+
        lmm1 = &lmv->lmv_md_v1;
        CDEBUG(level,
               "magic 0x%08X, master %#X stripe_count %#x hash_type %#x\n",
@@ -776,6 +790,12 @@ int mdt_fix_reply(struct mdt_thread_info *info)
                req_capsule_shrink(pill, &RMF_LOGCOOKIES, acl_size, RCL_SERVER);
        }
 
+       /* Shrink optional SECCTX buffer if it is not used */
+       if (req_capsule_has_field(pill, &RMF_FILE_SECCTX, RCL_SERVER) &&
+           req_capsule_get_size(pill, &RMF_FILE_SECCTX, RCL_SERVER) != 0 &&
+           !(body->mbo_valid & OBD_MD_SECCTX))
+               req_capsule_shrink(pill, &RMF_FILE_SECCTX, 0, RCL_SERVER);
+
        /*
         * Some more field should be shrinked if needed.
         * This should be done by those who added fields to reply message.