Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-07-03 17:32:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: eliminate multiple uses of FspFsvolFileRename locking

Browse Source
This commit is contained in:
Bill Zissimopoulos
2016-03-04 15:08:42 -08:00
parent 342fd6a996
commit 4d3a169da6
3 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sys/fileinfo.c
View File

@ -224,7 +224,7 @@ static NTSTATUS FspFsvolQueryNameInformation(PFILE_OBJECT FileObject,
if ((PVOID)(Info + 1) > BufferEnd)
return STATUS_BUFFER_TOO_SMALL;
FspFsvolDeviceFileRenameAcquireShared(FsvolDeviceObject);
FspFileNodeAcquireShared(FileNode, Main);
Info->FileNameLength = FsvolDeviceExtension->VolumePrefix.Length + FileNode->FileName.Length;
@ -246,7 +246,7 @@ static NTSTATUS FspFsvolQueryNameInformation(PFILE_OBJECT FileObject,
RtlCopyMemory(Buffer, FileNode->FileName.Buffer, CopyLength);
Buffer += CopyLength;
FspFsvolDeviceFileRenameRelease(FsvolDeviceObject);
FspFileNodeRelease(FileNode, Main);
*PBuffer = Buffer;
@ -715,7 +715,6 @@ static NTSTATUS FspFsvolSetDispositionInformation(
/* cannot delete root directory */
return STATUS_CANNOT_DELETE;
FspFsvolDeviceFileRenameAcquireShared(FsvolDeviceObject);
FspFileNodeAcquireExclusive(FileNode, Full);
if (Info->DeleteFile)
@ -740,16 +739,13 @@ static NTSTATUS FspFsvolSetDispositionInformation(
Request->Req.SetInformation.FileInformationClass = FileDispositionInformation;
Request->Req.SetInformation.Info.Disposition.Delete = Info->DeleteFile;
FspFsvolDeviceFileRenameSetOwner(FsvolDeviceObject, Request);
FspFileNodeSetOwner(FileNode, Full, Request);
FspIopRequestContext(Request, RequestFileNode) = FileNode;
FspIopRequestContext(Request, RequestDeviceObject) = FsvolDeviceObject;
return FSP_STATUS_IOQ_POST;
unlock_exit:
FspFileNodeRelease(FileNode, Full);
FspFsvolDeviceFileRenameRelease(FsvolDeviceObject);
return Result;
}
@ -760,7 +756,6 @@ static NTSTATUS FspFsvolSetDispositionInformationSuccess(
PAGED_CODE();
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
PDEVICE_OBJECT FsvolDeviceObject = IrpSp->DeviceObject;
PFILE_OBJECT FileObject = IrpSp->FileObject;
PFILE_DISPOSITION_INFORMATION Info = (PFILE_DISPOSITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer;
FSP_FILE_NODE *FileNode = FileObject->FsContext;
@ -770,9 +765,7 @@ static NTSTATUS FspFsvolSetDispositionInformationSuccess(
FileObject->DeletePending = Info->DeleteFile;
FspIopRequestContext(Request, RequestFileNode) = 0;
FspIopRequestContext(Request, RequestDeviceObject) = 0;
FspFileNodeReleaseOwner(FileNode, Full, Request);
FspFsvolDeviceFileRenameReleaseOwner(FsvolDeviceObject, Request);
Irp->IoStatus.Information = 0;