evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[driver] cosmetic changes

Browse source
This commit is contained in:
Olga Kornievskaia 2012-05-16 12:04:53 -04:00
parent 22ff7afc92
commit 2676e35ed0
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sys/nfs41_driver.c
View file

@ -3536,8 +3536,6 @@ NTSTATUS nfs41_Create(
{ {
NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES; NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES;
nfs41_updowncall_entry *entry = NULL; nfs41_updowncall_entry *entry = NULL;
FCB_INIT_PACKET InitPacket;
RX_FILE_TYPE StorageType = 0;
PNT_CREATE_PARAMETERS params = &RxContext->Create.NtCreateParameters; PNT_CREATE_PARAMETERS params = &RxContext->Create.NtCreateParameters;
PFILE_FULL_EA_INFORMATION ea = (PFILE_FULL_EA_INFORMATION) PFILE_FULL_EA_INFORMATION ea = (PFILE_FULL_EA_INFORMATION)
RxContext->CurrentIrp->AssociatedIrp.SystemBuffer; RxContext->CurrentIrp->AssociatedIrp.SystemBuffer;
@ -3732,6 +3730,8 @@ retry_on_link:
if (Fcb->OpenCount == 0 || if (Fcb->OpenCount == 0 ||
(Fcb->OpenCount > 0 && (Fcb->OpenCount > 0 &&
nfs41_fcb->changeattr != entry->ChangeTime)) { nfs41_fcb->changeattr != entry->ChangeTime)) {
FCB_INIT_PACKET InitPacket;
RX_FILE_TYPE StorageType = FileTypeNotYetKnown;
RtlCopyMemory(&nfs41_fcb->BasicInfo, &entry->u.Open.binfo, RtlCopyMemory(&nfs41_fcb->BasicInfo, &entry->u.Open.binfo,
sizeof(entry->u.Open.binfo)); sizeof(entry->u.Open.binfo));
RtlCopyMemory(&nfs41_fcb->StandardInfo, &entry->u.Open.sinfo, RtlCopyMemory(&nfs41_fcb->StandardInfo, &entry->u.Open.sinfo,
@ -4876,18 +4876,16 @@ NTSTATUS nfs41_QueryEaInformation(
if (entry->status == STATUS_SUCCESS) { if (entry->status == STATUS_SUCCESS) {
switch (entry->u.QueryEa.Overflow) { switch (entry->u.QueryEa.Overflow) {
case ERROR_INSUFFICIENT_BUFFER: case ERROR_INSUFFICIENT_BUFFER:
RxContext->InformationToReturn = entry->buf_len;
status = STATUS_BUFFER_TOO_SMALL; status = STATUS_BUFFER_TOO_SMALL;
break; break;
case ERROR_BUFFER_OVERFLOW: case ERROR_BUFFER_OVERFLOW:
RxContext->Info.LengthRemaining = entry->buf_len;
status = RxContext->IoStatusBlock.Status = STATUS_BUFFER_OVERFLOW; status = RxContext->IoStatusBlock.Status = STATUS_BUFFER_OVERFLOW;
break; break;
default: default:
RxContext->Info.LengthRemaining = entry->buf_len;
RxContext->IoStatusBlock.Status = STATUS_SUCCESS; RxContext->IoStatusBlock.Status = STATUS_SUCCESS;
break; break;
} }
RxContext->InformationToReturn = entry->buf_len;
#ifdef ENABLE_TIMINGS #ifdef ENABLE_TIMINGS
InterlockedIncrement(&getexattr.sops); InterlockedIncrement(&getexattr.sops);
InterlockedAdd64(&getexattr.size, entry->u.QueryEa.buf_len); InterlockedAdd64(&getexattr.size, entry->u.QueryEa.buf_len);
@ -5516,12 +5514,12 @@ NTSTATUS nfs41_SetFileInformation(
case FileRenameInformation: case FileRenameInformation:
{ {
/* noop if filename and destination are the same */ /* noop if filename and destination are the same */
PFILE_RENAME_INFORMATION rinfo = PFILE_RENAME_INFORMATION prinfo =
(PFILE_RENAME_INFORMATION)RxContext->Info.Buffer; (PFILE_RENAME_INFORMATION)RxContext->Info.Buffer;
const UNICODE_STRING dst = { (USHORT)rinfo->FileNameLength, const UNICODE_STRING dst = { (USHORT)prinfo->FileNameLength,
(USHORT)rinfo->FileNameLength, rinfo->FileName }; (USHORT)prinfo->FileNameLength, prinfo->FileName };
if (RtlCompareUnicodeString(&dst, if (RtlCompareUnicodeString(&dst,
SrvOpen->pAlreadyPrefixedName, FALSE) == 0) { SrvOpen->pAlreadyPrefixedName, FALSE) == 0) {
status = STATUS_SUCCESS; status = STATUS_SUCCESS;
goto out; goto out;
} }