!655 TCB中使用的execFile字段改为execVnode

Merge pull request !655 from LeonChan/execfile

fs/vfs/vnode.c

@@ -434,7 +434,6 @@ int VnodeLookupAt(const char *path, struct Vnode **result, uint32_t flags, struc
             currentVnode->filePath[vnodePathLen] = 0;
         }
     }
-    return ret;
 
 OUT_FREE_PATH:
     if (normalizedPath) {

kernel/base/include/los_process_pri.h

@@ -121,7 +121,7 @@ typedef struct ProcessCB {
     TimerIdMap           timerIdMap;
 #endif
 #ifdef LOSCFG_DRIVERS_TZDRIVER
-    struct file          *execFile;   /**< Exec bin of the process */
+    struct Vnode        *execVnode;   /**< Exec bin of the process */
 #endif
     mode_t               umask;
 #ifdef LOSCFG_KERNEL_CPUP

kernel/extended/dynload/src/los_load_elf.c

@@ -225,12 +225,14 @@ STATIC INT32 OsReadEhdr(const CHAR *fileName, ELFInfo *elfInfo, BOOL isExecFile)
 
 #ifdef LOSCFG_DRIVERS_TZDRIVER
     if (isExecFile) {
-        ret = fs_getfilep(GetAssociatedSystemFd(elfInfo->procfd), &OsCurrProcessGet()->execFile);
+        struct file *filep;
+        ret = fs_getfilep(GetAssociatedSystemFd(elfInfo->procfd), &filep);
         if (ret) {
             PRINT_ERR("%s[%d], Failed to get struct file %s!\n", __FUNCTION__, __LINE__, fileName);
             /* File will be closed by OsLoadELFFile */
             return ret;
         }
+        OsCurrProcessGet()->execVnode = filep->f_vnode;
     }
 #endif
     ret = OsReadELFInfo(elfInfo->procfd, (UINT8 *)&elfInfo->elfEhdr, sizeof(LD_ELF_EHDR), 0);