From a7165067d79814bacabd55e9bab66c6a3ae45b76 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Wed, 24 Apr 2013 23:30:53 -0400 Subject: [PATCH] Windows: pSrcObject instead of pSrcFcb->ObjectInformation In AFSSetFileLinkInfo and AFSSetRenameInfo consistently use the variable pSrcObject instead of pSrcFcb->ObjectInformation. pSrcObject is a local alias. Mixing both forms in the same function is confusing. Change-Id: I6b078d783389eb57ed5d36cbc463018e6199e17d Reviewed-on: http://gerrit.openafs.org/9810 Tested-by: BuildBot Reviewed-by: Rod Widdowson Reviewed-by: Jeffrey Altman --- src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp index e604caf35..d739860db 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp @@ -2340,11 +2340,11 @@ AFSSetFileLinkInfo( IN PIRP Irp) pSrcObject = pSrcFcb->ObjectInformation; - if ( BooleanFlagOn( pSrcFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) + if ( BooleanFlagOn( pSrcObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) { - pSrcParentObject = AFSFindObjectInfo( pSrcFcb->ObjectInformation->VolumeCB, - &pSrcFcb->ObjectInformation->ParentFileId, + pSrcParentObject = AFSFindObjectInfo( pSrcObject->VolumeCB, + &pSrcObject->ParentFileId, TRUE); } @@ -2605,7 +2605,7 @@ AFSSetFileLinkInfo( IN PIRP Irp) // request to the service. // - ntStatus = AFSNotifyHardLink( pSrcFcb->ObjectInformation, + ntStatus = AFSNotifyHardLink( pSrcObject, &pSrcCcb->AuthGroup, pSrcParentObject, pTargetDcb->ObjectInformation, @@ -2776,11 +2776,11 @@ AFSSetRenameInfo( IN PIRP Irp) pSrcObject = pSrcFcb->ObjectInformation; - if ( BooleanFlagOn( pSrcFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) + if ( BooleanFlagOn( pSrcObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) { - pSrcParentObject = AFSFindObjectInfo( pSrcFcb->ObjectInformation->VolumeCB, - &pSrcFcb->ObjectInformation->ParentFileId, + pSrcParentObject = AFSFindObjectInfo( pSrcObject->VolumeCB, + &pSrcObject->ParentFileId, TRUE); } @@ -2821,7 +2821,7 @@ AFSSetRenameInfo( IN PIRP Irp) // If there are any open children then fail the rename // - if( pSrcFcb->ObjectInformation->Specific.Directory.ChildOpenHandleCount > 0) + if( pSrcObject->Specific.Directory.ChildOpenHandleCount > 0) { AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, @@ -3085,7 +3085,7 @@ AFSSetRenameInfo( IN PIRP Irp) // request to the service. // - ntStatus = AFSNotifyRename( pSrcFcb->ObjectInformation, + ntStatus = AFSNotifyRename( pSrcObject, &pSrcCcb->AuthGroup, pSrcParentObject, pTargetDcb->ObjectInformation, @@ -3130,7 +3130,7 @@ AFSSetRenameInfo( IN PIRP Irp) ulNotificationAction = FILE_ACTION_REMOVED; } - if( pSrcFcb->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY) + if( pSrcObject->FileType == AFS_FILE_TYPE_DIRECTORY) { ulNotifyFilter = FILE_NOTIFY_CHANGE_DIR_NAME; @@ -3321,9 +3321,9 @@ AFSSetRenameInfo( IN PIRP Irp) pSrcParentObject, lCount)); - pSrcFcb->ObjectInformation->ParentFileId = pTargetParentObject->FileId; + pSrcObject->ParentFileId = pTargetParentObject->FileId; - SetFlag( pSrcFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_PARENT_FID); + SetFlag( pSrcObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID); AFSReleaseResource( pSrcParentObject->VolumeCB->ObjectInfoTree.TreeLock); -- 2.39.5