reverted last change

svn path=/trunk/; revision=16761
This commit is contained in:
Hartmut Birr 2005-07-26 21:33:38 +00:00
parent b0faf4f537
commit 13b2222c28

View file

@ -910,16 +910,14 @@ ExMapHandleToPointer(IN PHANDLE_TABLE HandleTable,
ASSERT(HandleTable);
ExAcquireHandleTableLockShared(HandleTable);
HandleTableEntry = ExpLookupHandleTableEntry(HandleTable,
Handle);
if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry))
{
DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry);
ExReleaseHandleTableLock(HandleTable);
return HandleTableEntry;
}
ExReleaseHandleTableLock(HandleTable);
return NULL;
}
@ -938,14 +936,12 @@ ExChangeHandle(IN PHANDLE_TABLE HandleTable,
ASSERT(ChangeHandleCallback);
KeEnterCriticalRegion();
ExAcquireHandleTableLockShared(HandleTable);
HandleTableEntry = ExpLookupHandleTableEntry(HandleTable,
Handle);
if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry))
{
ExReleaseHandleTableLock(HandleTable);
Ret = ChangeHandleCallback(HandleTable,
HandleTableEntry,
NULL);
@ -953,10 +949,7 @@ ExChangeHandle(IN PHANDLE_TABLE HandleTable,
ExUnlockHandleTableEntry(HandleTable,
HandleTableEntry);
}
else
{
ExReleaseHandleTableLock(HandleTable);
}
KeLeaveCriticalRegion();
return Ret;