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

[driver] handling UNC paths

Browse source
This commit is contained in:
Olga Kornievskaia 2011-04-20 12:36:02 -04:00
parent 089a283a3a
commit 5628175fbb
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
sys/nfs41_driver.c
View file

@ -282,6 +282,7 @@ typedef struct _NFS41_NETROOT_EXTENSION {
HANDLE auth_sys_session; HANDLE auth_sys_session;
HANDLE gss_session; HANDLE gss_session;
DWORD nfs41d_version; DWORD nfs41d_version;
BOOLEAN do_umount;
} NFS41_NETROOT_EXTENSION, *PNFS41_NETROOT_EXTENSION; } NFS41_NETROOT_EXTENSION, *PNFS41_NETROOT_EXTENSION;
#define NFS41GetNetRootExtension(pNetRoot) \ #define NFS41GetNetRootExtension(pNetRoot) \
(((pNetRoot) == NULL) ? NULL : (PNFS41_NETROOT_EXTENSION)((pNetRoot)->Context)) (((pNetRoot) == NULL) ? NULL : (PNFS41_NETROOT_EXTENSION)((pNetRoot)->Context))
@ -2110,7 +2111,6 @@ NTSTATUS nfs41_CreateSrvCall(
ASSERT( pSrvCall ); ASSERT( pSrvCall );
ASSERT( NodeType(pSrvCall) == RDBSS_NTC_SRVCALL ); ASSERT( NodeType(pSrvCall) == RDBSS_NTC_SRVCALL );
DbgP("pCallbackContext %p\n", pCallbackContext);
if (IoGetCurrentProcess() == RxGetRDBSSProcess()) { if (IoGetCurrentProcess() == RxGetRDBSSProcess()) {
DbgP("executing with RDBSS context\n"); DbgP("executing with RDBSS context\n");
status = _nfs41_CreateSrvCall(pCallbackContext); status = _nfs41_CreateSrvCall(pCallbackContext);
@ -2411,14 +2411,15 @@ NTSTATUS nfs41_CreateVNetRoot(
print_net_root(0, pNetRoot); print_net_root(0, pNetRoot);
print_v_net_root(1, pVNetRoot); print_v_net_root(1, pVNetRoot);
DbgP("pVNetRoot=%p pNetRoot=%p\n", pVNetRoot, pNetRoot); DbgP("pVNetRoot=%p pNetRoot=%p pSrvCall=%p\n", pVNetRoot, pNetRoot, pSrvCall);
DbgP("pNetRoot=%wZ pSrvCallName=%wZ VirtualNetRootStatus=0x%x " DbgP("pNetRoot=%wZ Type=%d pSrvCallName=%wZ VirtualNetRootStatus=0x%x "
"NetRootStatus=0x%x\n", pNetRoot->pNetRootName, pSrvCall->pSrvCallName, "NetRootStatus=0x%x\n", pNetRoot->pNetRootName,
pNetRoot->Type, pSrvCall->pSrvCallName,
pCreateNetRootContext->VirtualNetRootStatus, pCreateNetRootContext->VirtualNetRootStatus,
pCreateNetRootContext->NetRootStatus); pCreateNetRootContext->NetRootStatus);
if (pNetRoot->Type != NET_ROOT_DISK) { if (pNetRoot->Type != NET_ROOT_DISK && pNetRoot->Type != NET_ROOT_WILD) {
print_error("pNetRoot->Type %u != NET_ROOT_DISK\n", pNetRoot->Type); print_error("Unsupported NetRoot Type %u\n", pNetRoot->Type);
status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
goto out; goto out;
} }
@ -2479,6 +2480,7 @@ NTSTATUS nfs41_CreateVNetRoot(
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
goto out; goto out;
pNetRootContext->nfs41d_version = nfs41d_version; pNetRootContext->nfs41d_version = nfs41d_version;
pNetRootContext->do_umount = TRUE;
if (pVNetRootContext->sec_flavor == RPCSEC_AUTH_SYS) if (pVNetRootContext->sec_flavor == RPCSEC_AUTH_SYS)
pNetRootContext->auth_sys_session = pVNetRootContext->session; pNetRootContext->auth_sys_session = pVNetRootContext->session;
else else
@ -2574,7 +2576,7 @@ NTSTATUS nfs41_FinalizeNetRoot(
DbgEn(); DbgEn();
print_net_root(1, pNetRoot); print_net_root(1, pNetRoot);
if (pNetRoot->Type != NET_ROOT_DISK) { if (pNetRoot->Type != NET_ROOT_DISK && pNetRoot->Type != NET_ROOT_WILD) {
status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
goto out; goto out;
} }
@ -2591,7 +2593,7 @@ NTSTATUS nfs41_FinalizeNetRoot(
goto out; goto out;
} }
if (pNetRootContext->auth_sys_session) { if (pNetRootContext->auth_sys_session && pNetRootContext->do_umount) {
status = nfs41_unmount(pNetRootContext->auth_sys_session, pNetRootContext->nfs41d_version); status = nfs41_unmount(pNetRootContext->auth_sys_session, pNetRootContext->nfs41d_version);
if (status) { if (status) {
print_error("nfs41_mount AUTH_SYS failed with %d\n", status); print_error("nfs41_mount AUTH_SYS failed with %d\n", status);
@ -2640,7 +2642,8 @@ NTSTATUS nfs41_FinalizeVNetRoot(
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
DbgEn(); DbgEn();
print_v_net_root(1, pVNetRoot); print_v_net_root(1, pVNetRoot);
if (pVNetRoot->pNetRoot->Type != NET_ROOT_DISK) if (pVNetRoot->pNetRoot->Type != NET_ROOT_DISK &&
pVNetRoot->pNetRoot->Type != NET_ROOT_WILD)
status = STATUS_NOT_SUPPORTED; status = STATUS_NOT_SUPPORTED;
DbgEx(); DbgEx();
return status; return status;
@ -2747,9 +2750,10 @@ NTSTATUS nfs41_Create(
if (RxContext->CurrentIrp->AssociatedIrp.SystemBuffer) if (RxContext->CurrentIrp->AssociatedIrp.SystemBuffer)
print_ea_info(1, RxContext->CurrentIrp->AssociatedIrp.SystemBuffer); print_ea_info(1, RxContext->CurrentIrp->AssociatedIrp.SystemBuffer);
if (Fcb->pNetRoot->Type != NET_ROOT_DISK) { if (Fcb->pNetRoot->Type != NET_ROOT_DISK &&
print_error("unknown netroot type %d\n", Fcb->pNetRoot->Type); Fcb->pNetRoot->Type != NET_ROOT_WILD) {
status = STATUS_NOT_IMPLEMENTED; print_error("Unsupported NetRoot Type %u\n", Fcb->pNetRoot->Type);
status = STATUS_NOT_SUPPORTED;
goto out; goto out;
} }
@ -4889,7 +4893,7 @@ NTSTATUS nfs41_init_ops()
RDBSS_MANAGE_SRV_OPEN_EXTENSION | RDBSS_MANAGE_SRV_OPEN_EXTENSION |
RDBSS_MANAGE_FOBX_EXTENSION); RDBSS_MANAGE_FOBX_EXTENSION);
nfs41_ops.MRxSrvCallSize = 0; nfs41_ops.MRxSrvCallSize = 0; // srvcall extension is not handled in rdbss
nfs41_ops.MRxNetRootSize = sizeof(NFS41_NETROOT_EXTENSION); nfs41_ops.MRxNetRootSize = sizeof(NFS41_NETROOT_EXTENSION);
nfs41_ops.MRxVNetRootSize = sizeof(NFS41_V_NET_ROOT_EXTENSION); nfs41_ops.MRxVNetRootSize = sizeof(NFS41_V_NET_ROOT_EXTENSION);
nfs41_ops.MRxFcbSize = sizeof(NFS41_FCB); nfs41_ops.MRxFcbSize = sizeof(NFS41_FCB);