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

[driver] change nt_params structure to pointer

Browse source
This commit is contained in:
Olga Kornievskaia 2012-04-26 16:13:24 -04:00
parent 495760d69a
commit 3e334ef73a
1 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

70
sys/nfs41_driver.c
View file

@ -3396,7 +3396,7 @@ NTSTATUS check_nfs41_create_args(
IN PRX_CONTEXT RxContext) IN PRX_CONTEXT RxContext)
{ {
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
NT_CREATE_PARAMETERS params = RxContext->Create.NtCreateParameters; PNT_CREATE_PARAMETERS params = &RxContext->Create.NtCreateParameters;
__notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen; __notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen;
__notnull PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = __notnull PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
@ -3435,7 +3435,7 @@ NTSTATUS check_nfs41_create_args(
} }
if (pVNetRootContext->read_only && if (pVNetRootContext->read_only &&
(params.DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA))) { (params->DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA))) {
status = STATUS_NETWORK_ACCESS_DENIED; status = STATUS_NETWORK_ACCESS_DENIED;
goto out; goto out;
} }
@ -3451,22 +3451,22 @@ NTSTATUS check_nfs41_create_args(
/* ms-fsa: 3.1.5.1.2.1 page 68 */ /* ms-fsa: 3.1.5.1.2.1 page 68 */
if (Fcb->OpenCount && nfs41_fcb->StandardInfo.DeletePending && if (Fcb->OpenCount && nfs41_fcb->StandardInfo.DeletePending &&
!(params.ShareAccess & FILE_SHARE_DELETE) && !(params->ShareAccess & FILE_SHARE_DELETE) &&
(params.DesiredAccess & (FILE_EXECUTE | FILE_READ_DATA | (params->DesiredAccess & (FILE_EXECUTE | FILE_READ_DATA |
FILE_WRITE_DATA | FILE_APPEND_DATA))) { FILE_WRITE_DATA | FILE_APPEND_DATA))) {
status = STATUS_SHARING_VIOLATION; status = STATUS_SHARING_VIOLATION;
goto out; goto out;
} }
/* rdbss seems miss this sharing_violation check */ /* rdbss seems miss this sharing_violation check */
if (Fcb->OpenCount && params.Disposition == FILE_SUPERSEDE) { if (Fcb->OpenCount && params->Disposition == FILE_SUPERSEDE) {
if ((!RxContext->CurrentIrpSp->FileObject->SharedRead && if ((!RxContext->CurrentIrpSp->FileObject->SharedRead &&
(params.DesiredAccess & FILE_READ_DATA)) || (params->DesiredAccess & FILE_READ_DATA)) ||
(!RxContext->CurrentIrpSp->FileObject->SharedWrite && (!RxContext->CurrentIrpSp->FileObject->SharedWrite &&
(params.DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA | (params->DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA |
FILE_WRITE_ATTRIBUTES)) || FILE_WRITE_ATTRIBUTES)) ||
(!RxContext->CurrentIrpSp->FileObject->SharedDelete && (!RxContext->CurrentIrpSp->FileObject->SharedDelete &&
(params.DesiredAccess & DELETE)))) { (params->DesiredAccess & DELETE)))) {
status = STATUS_SHARING_VIOLATION; status = STATUS_SHARING_VIOLATION;
goto out; goto out;
} }
@ -3476,14 +3476,14 @@ NTSTATUS check_nfs41_create_args(
goto out; goto out;
} }
if (!areOpenParamsValid(&params)) { if (!areOpenParamsValid(params)) {
status = STATUS_INVALID_PARAMETER; status = STATUS_INVALID_PARAMETER;
goto out; goto out;
} }
/* from ms-fsa 3.1.5.1.1 page 56 */ /* from ms-fsa 3.1.5.1.1 page 56 */
if ((params.CreateOptions & FILE_DELETE_ON_CLOSE) && if ((params->CreateOptions & FILE_DELETE_ON_CLOSE) &&
(params.FileAttributes & FILE_ATTRIBUTE_READONLY)) { (params->FileAttributes & FILE_ATTRIBUTE_READONLY)) {
status = STATUS_CANNOT_DELETE; status = STATUS_CANNOT_DELETE;
goto out; goto out;
} }
@ -3497,7 +3497,7 @@ NTSTATUS check_nfs41_create_args(
status = STATUS_EAS_NOT_SUPPORTED; status = STATUS_EAS_NOT_SUPPORTED;
goto out; goto out;
} }
if ((params.DesiredAccess & FILE_WRITE_EA) == 0) { if ((params->DesiredAccess & FILE_WRITE_EA) == 0) {
status = STATUS_ACCESS_DENIED; status = STATUS_ACCESS_DENIED;
goto out; goto out;
} }
@ -3518,7 +3518,7 @@ NTSTATUS nfs41_Create(
nfs41_updowncall_entry *entry = NULL; nfs41_updowncall_entry *entry = NULL;
FCB_INIT_PACKET InitPacket; FCB_INIT_PACKET InitPacket;
RX_FILE_TYPE StorageType = 0; RX_FILE_TYPE StorageType = 0;
NT_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;
__notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen; __notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen;
@ -3558,21 +3558,21 @@ NTSTATUS nfs41_Create(
if (status) goto out; if (status) goto out;
entry->u.Open.filename = SrvOpen->pAlreadyPrefixedName; entry->u.Open.filename = SrvOpen->pAlreadyPrefixedName;
entry->u.Open.access_mask = params.DesiredAccess; entry->u.Open.access_mask = params->DesiredAccess;
entry->u.Open.access_mode = params.ShareAccess; entry->u.Open.access_mode = params->ShareAccess;
entry->u.Open.attrs = params.FileAttributes; entry->u.Open.attrs = params->FileAttributes;
if (!(params.CreateOptions & FILE_DIRECTORY_FILE)) if (!(params->CreateOptions & FILE_DIRECTORY_FILE))
entry->u.Open.attrs |= FILE_ATTRIBUTE_ARCHIVE; entry->u.Open.attrs |= FILE_ATTRIBUTE_ARCHIVE;
entry->u.Open.disp = params.Disposition; entry->u.Open.disp = params->Disposition;
entry->u.Open.copts = params.CreateOptions; entry->u.Open.copts = params->CreateOptions;
/* treat the NfsActOnLink ea as FILE_OPEN_REPARSE_POINT */ /* treat the NfsActOnLink ea as FILE_OPEN_REPARSE_POINT */
if (ea && AnsiStrEq(&NfsActOnLink, ea->EaName, ea->EaNameLength)) if (ea && AnsiStrEq(&NfsActOnLink, ea->EaName, ea->EaNameLength))
entry->u.Open.copts |= FILE_OPEN_REPARSE_POINT; entry->u.Open.copts |= FILE_OPEN_REPARSE_POINT;
entry->u.Open.srv_open = SrvOpen; entry->u.Open.srv_open = SrvOpen;
if (isDataAccess(params.DesiredAccess) || isOpen2Create(params.Disposition)) if (isDataAccess(params->DesiredAccess) || isOpen2Create(params->Disposition))
entry->u.Open.open_owner_id = InterlockedIncrement(&open_owner_id); entry->u.Open.open_owner_id = InterlockedIncrement(&open_owner_id);
// if we are creating a file check if nfsv3attributes were passed in // if we are creating a file check if nfsv3attributes were passed in
if (params.Disposition != FILE_OPEN && params.Disposition != FILE_OVERWRITE) { if (params->Disposition != FILE_OPEN && params->Disposition != FILE_OVERWRITE) {
entry->u.Open.mode = 0777; entry->u.Open.mode = 0777;
if (ea && AnsiStrEq(&NfsV3Attributes, ea->EaName, ea->EaNameLength)) { if (ea && AnsiStrEq(&NfsV3Attributes, ea->EaName, ea->EaNameLength)) {
nfs3_attrs *attrs = (nfs3_attrs *)(ea->EaName + ea->EaNameLength + 1); nfs3_attrs *attrs = (nfs3_attrs *)(ea->EaName + ea->EaNameLength + 1);
@ -3581,7 +3581,7 @@ NTSTATUS nfs41_Create(
#endif #endif
entry->u.Open.mode = attrs->mode; entry->u.Open.mode = attrs->mode;
} }
if (params.FileAttributes & FILE_ATTRIBUTE_READONLY) if (params->FileAttributes & FILE_ATTRIBUTE_READONLY)
entry->u.Open.mode = 0444; entry->u.Open.mode = 0444;
} }
status = nfs41_UpcallWaitForReply(entry, pVNetRootContext->timeout); status = nfs41_UpcallWaitForReply(entry, pVNetRootContext->timeout);
@ -3684,7 +3684,7 @@ NTSTATUS nfs41_Create(
sizeof(entry->u.Open.sinfo)); sizeof(entry->u.Open.sinfo));
nfs41_fcb->mode = entry->u.Open.mode; nfs41_fcb->mode = entry->u.Open.mode;
nfs41_fcb->changeattr = entry->u.Open.changeattr; nfs41_fcb->changeattr = entry->u.Open.changeattr;
if (((params.CreateOptions & FILE_DELETE_ON_CLOSE) && if (((params->CreateOptions & FILE_DELETE_ON_CLOSE) &&
!pVNetRootContext->read_only) || oldDeletePending) !pVNetRootContext->read_only) || oldDeletePending)
nfs41_fcb->StandardInfo.DeletePending = TRUE; nfs41_fcb->StandardInfo.DeletePending = TRUE;
@ -3724,26 +3724,26 @@ NTSTATUS nfs41_Create(
#endif #endif
RxChangeBufferingState((PSRV_OPEN)SrvOpen, ULongToPtr(flag), 1); RxChangeBufferingState((PSRV_OPEN)SrvOpen, ULongToPtr(flag), 1);
} else if (!nfs41_fcb->StandardInfo.Directory && } else if (!nfs41_fcb->StandardInfo.Directory &&
isDataAccess(params.DesiredAccess)) { isDataAccess(params->DesiredAccess)) {
nfs41_fobx->deleg_type = entry->u.Open.deleg_type; nfs41_fobx->deleg_type = entry->u.Open.deleg_type;
#ifdef DEBUG_OPEN #ifdef DEBUG_OPEN
DbgP("nfs41_Create: received delegation %d\n", entry->u.Open.deleg_type); DbgP("nfs41_Create: received delegation %d\n", entry->u.Open.deleg_type);
#endif #endif
if (!(params.CreateOptions & FILE_WRITE_THROUGH) && if (!(params->CreateOptions & FILE_WRITE_THROUGH) &&
!pVNetRootContext->write_thru && !pVNetRootContext->write_thru &&
(entry->u.Open.deleg_type == 2 || (entry->u.Open.deleg_type == 2 ||
(params.DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)))) { (params->DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)))) {
#ifdef DEBUG_OPEN #ifdef DEBUG_OPEN
DbgP("nfs41_Create: enabling write buffering\n"); DbgP("nfs41_Create: enabling write buffering\n");
#endif #endif
SrvOpen->BufferingFlags |= SrvOpen->BufferingFlags |=
(FCB_STATE_WRITECACHING_ENABLED | (FCB_STATE_WRITECACHING_ENABLED |
FCB_STATE_WRITEBUFFERING_ENABLED); FCB_STATE_WRITEBUFFERING_ENABLED);
} else if (params.CreateOptions & FILE_WRITE_THROUGH || } else if (params->CreateOptions & FILE_WRITE_THROUGH ||
pVNetRootContext->write_thru) pVNetRootContext->write_thru)
nfs41_fobx->write_thru = TRUE; nfs41_fobx->write_thru = TRUE;
if (entry->u.Open.deleg_type >= 1 || if (entry->u.Open.deleg_type >= 1 ||
params.DesiredAccess & FILE_READ_DATA) { params->DesiredAccess & FILE_READ_DATA) {
#ifdef DEBUG_OPEN #ifdef DEBUG_OPEN
DbgP("nfs41_Create: enabling read buffering\n"); DbgP("nfs41_Create: enabling read buffering\n");
#endif #endif
@ -3752,7 +3752,7 @@ NTSTATUS nfs41_Create(
FCB_STATE_READCACHING_ENABLED); FCB_STATE_READCACHING_ENABLED);
} }
if (pVNetRootContext->nocache || if (pVNetRootContext->nocache ||
(params.CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING)) { (params->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING)) {
#ifdef DEBUG_OPEN #ifdef DEBUG_OPEN
DbgP("nfs41_Create: disabling buffering\n"); DbgP("nfs41_Create: disabling buffering\n");
#endif #endif
@ -3779,12 +3779,12 @@ NTSTATUS nfs41_Create(
} }
} }
if ((params.CreateOptions & FILE_DELETE_ON_CLOSE) && if ((params->CreateOptions & FILE_DELETE_ON_CLOSE) &&
!pVNetRootContext->read_only) !pVNetRootContext->read_only)
nfs41_fcb->StandardInfo.DeletePending = TRUE; nfs41_fcb->StandardInfo.DeletePending = TRUE;
RxContext->Create.ReturnedCreateInformation = RxContext->Create.ReturnedCreateInformation =
map_disposition_to_create_retval(params.Disposition, entry->errno); map_disposition_to_create_retval(params->Disposition, entry->errno);
RxContext->pFobx->OffsetOfNextEaToReturn = 1; RxContext->pFobx->OffsetOfNextEaToReturn = 1;
RxContext->CurrentIrp->IoStatus.Information = RxContext->CurrentIrp->IoStatus.Information =
@ -3797,10 +3797,10 @@ out_free:
out: out:
#ifdef ENABLE_TIMINGS #ifdef ENABLE_TIMINGS
t2 = KeQueryPerformanceCounter(NULL); t2 = KeQueryPerformanceCounter(NULL);
if ((params.DesiredAccess & FILE_READ_DATA) || if ((params->DesiredAccess & FILE_READ_DATA) ||
(params.DesiredAccess & FILE_WRITE_DATA) || (params->DesiredAccess & FILE_WRITE_DATA) ||
(params.DesiredAccess & FILE_APPEND_DATA) || (params->DesiredAccess & FILE_APPEND_DATA) ||
(params.DesiredAccess & FILE_EXECUTE)) { (params->DesiredAccess & FILE_EXECUTE)) {
InterlockedIncrement(&open.tops); InterlockedIncrement(&open.tops);
InterlockedAdd64(&open.ticks, t2.QuadPart - t1.QuadPart); InterlockedAdd64(&open.ticks, t2.QuadPart - t1.QuadPart);
#ifdef ENABLE_INDV_TIMINGS #ifdef ENABLE_INDV_TIMINGS