Revision: 18688
http://sourceforge.net/p/edk2/code/18688
Author: lzeng14
Date: 2015-10-28 00:48:43 +0000 (Wed, 28 Oct 2015)
Log Message:
-----------
MdeModulePkg Variable: Move CacheVariable->InDeletedTransitionPtr NULL pointer
check
This change is triggered by R18654 "Enhance variable performance by reading
from existed memory cache"
that changed the code to use CacheVariable to improve performance.
So the CacheVariable->InDeletedTransitionPtr NULL pointer check needs to be
moved to the place before
it is been used.
Cc: Shumin Qiu <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <[email protected]>
Reviewed-by: Shumin Qiu <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/18654
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
Modified: trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
2015-10-27 23:10:49 UTC (rev 18687)
+++ trunk/edk2/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
2015-10-28 00:48:43 UTC (rev 18688)
@@ -2280,6 +2280,7 @@
// Both ADDED and IN_DELETED_TRANSITION variable are present,
// set IN_DELETED_TRANSITION one to DELETED state first.
//
+ ASSERT (CacheVariable->InDeletedTransitionPtr != NULL);
State = CacheVariable->InDeletedTransitionPtr->State;
State &= VAR_DELETED;
Status = UpdateVariableStore (
@@ -2293,7 +2294,6 @@
);
if (!EFI_ERROR (Status)) {
if (!Variable->Volatile) {
- ASSERT (CacheVariable->InDeletedTransitionPtr != NULL);
CacheVariable->InDeletedTransitionPtr->State = State;
}
} else {
@@ -2719,6 +2719,7 @@
// Both ADDED and IN_DELETED_TRANSITION old variable are present,
// set IN_DELETED_TRANSITION one to DELETED state first.
//
+ ASSERT (CacheVariable->InDeletedTransitionPtr != NULL);
State = CacheVariable->InDeletedTransitionPtr->State;
State &= VAR_DELETED;
Status = UpdateVariableStore (
@@ -2732,7 +2733,6 @@
);
if (!EFI_ERROR (Status)) {
if (!Variable->Volatile) {
- ASSERT (CacheVariable->InDeletedTransitionPtr != NULL);
CacheVariable->InDeletedTransitionPtr->State = State;
}
} else {
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
