--- ./source/private_module/ctrl/sys/cfg/cfg_obj/cfg_obj_diskpool.c	2018-04-20 08:57:57.000000000 +0000
+++ ./source/private_module/ctrl/sys/cfg/cfg_obj/cfg_obj_diskpool.c.hotpatch	2020-04-25 07:26:01.000000000 +0000
@@ -7628,31 +7628,31 @@
 /**************************************************************************
     :  diskpool Ĳ麯 ---poolϢ
 :  task -- Ϣtask
-:  
-ֵ  :  
     : 
 **************************************************************************/
 int32_t expandDiskPoolCheckPoolInfo(TASK_S *task)
 {
     CFG_TASK_S              *cfgCheckPara = NULL;
     TLV_MSG_OBJ_DISK_POOL_S *poolCfgInfo   = NULL;
-
+    int32_t                  ret = RETURN_ERROR;
     SYS_ASSERT_RET(NULL != task, RETURN_ERROR);
-
     cfgCheckPara = (CFG_TASK_S*)task;
-    
-     /* ӴӡϢ */
     SET_SYS_TRACE_STEP(cfgCheckPara->traceType, task);
-
     poolCfgInfo = (TLV_MSG_OBJ_DISK_POOL_S*)(cfgCheckPara->msgStru);
     SYS_IF_TASK(NULL != poolCfgInfo, task, ACTION_CALL_TYPE_DONE, RETURN_ERROR);
-
-    SET_ACTION_CHILDNUM((TASK_S *)cfgCheckPara, ONE_CHILD_ACTION);
-    DBG_LogDebug(LOG_ID_056D,
-              "SYS_CFG: Call for object control to get diskpool information.");
-    /* ȴȡpoolϢ */
+    ret = checkDiskListEncryptInfo(poolCfgInfo->encryptDiskType, poolCfgInfo->diskList, cfgCheckPara->opCode);
+    if (RETURN_OK != ret) {
+        TASK_CALL_ACTION_DONE_ASYNC_WITH_RESULT(task, ret);
+        return ret;
+    }
+    /*װģʽ²ܹ*/
+    if ((SYS_EQU_MODE_NORMAL == getClsEquipmentMode()) && (EXT_FULL_SED == poolCfgInfo->encryptDiskType)) {
+        SET_ACTION_CHILDNUM((TASK_S *)cfgCheckPara, (int32_t)TWO_CHILD_ACTION);
+        ldGetServerLinkState(defaultProcCallBack, cfgCheckPara);
+    } else {
+        SET_ACTION_CHILDNUM((TASK_S *)cfgCheckPara, ONE_CHILD_ACTION);
+    }
     objGetDiskPooInfo(poolCfgInfo->diskPoolId, getDiskPoolInfoCallBack, cfgCheckPara);
-
     return RETURN_OK;
 }
 /**************************************************************************
@@ -7777,16 +7777,16 @@
     /* CR-01889196-OceanStor 18800 V3 V300R003C00 modified by z00230408 2015-9-15 end */
     
     /*AR-0000840926, modified by z00285285,2015-1-3 for encrypt disk begin*/    
-    ret = checkDiskListEncryptInfo(poolCfgInfo->encryptDiskType, poolCfgInfo->diskList, cfgCheckPara->opCode);
-    if (RETURN_OK != ret)
-    {
-        return ret;
-    }
-    if (EXT_FULL_SED == poolCfgInfo->encryptDiskType)
-    {
-        ret = openEncryptDiskAk(cfgCheckPara);
-        return ret;
-    }
+    //ret = checkDiskListEncryptInfo(poolCfgInfo->encryptDiskType, poolCfgInfo->diskList, cfgCheckPara->opCode);
+    //if (RETURN_OK != ret)
+    //{
+    //    return ret;
+    //}
+    //if (EXT_FULL_SED == poolCfgInfo->encryptDiskType)
+    //{
+    //    ret = openEncryptDiskAk(cfgCheckPara);
+    //    return ret;
+    //}
     /*AR-0000840926, modified by z00285285,2015-1-3 for encrypt disk begin*/    
     SET_ACTION_CHILDNUM((TASK_S *)cfgCheckPara, ONE_CHILD_ACTION);
     createCheckDiskPoolExpandParaChildTask(cfgCheckPara);
