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

mount: check for existing session instead of config.initialized

Browse source 
removed NFS41_MOUNT_CONFIG.Initialized field, and replaced checks for Config.Initialized with session != NULL

Signed-off-by: Casey Bodley <cbodley@umich.edu>
This commit is contained in:
Casey Bodley 2010-10-12 09:45:18 -04:00
parent f612321571
commit 5861659162
1 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

39
sys/nfs41_driver.c
View file

@ -268,7 +268,6 @@ typedef struct _NFS41_MOUNT_CONFIG {
UNICODE_STRING SrvName; UNICODE_STRING SrvName;
WCHAR mntpt_buffer[MAX_PATH]; WCHAR mntpt_buffer[MAX_PATH];
UNICODE_STRING MntPt; UNICODE_STRING MntPt;
BOOLEAN Initialized;
} NFS41_MOUNT_CONFIG, *PNFS41_MOUNT_CONFIG; } NFS41_MOUNT_CONFIG, *PNFS41_MOUNT_CONFIG;
typedef struct _NFS41_NETROOT_EXTENSION { typedef struct _NFS41_NETROOT_EXTENSION {
@ -2007,8 +2006,6 @@ void nfs41_MountConfig_InitDefaults(
Config->MntPt.Length = MAX_PATH; Config->MntPt.Length = MAX_PATH;
Config->MntPt.MaximumLength = MAX_PATH; Config->MntPt.MaximumLength = MAX_PATH;
Config->MntPt.Buffer = Config->mntpt_buffer; Config->MntPt.Buffer = Config->mntpt_buffer;
Config->Initialized = FALSE;
} }
static NTSTATUS nfs41_MountConfig_ParseBoolean( static NTSTATUS nfs41_MountConfig_ParseBoolean(
@ -2128,9 +2125,6 @@ NTSTATUS nfs41_MountConfig_ParseOptions(
((PBYTE)Option + Option->NextEntryOffset); ((PBYTE)Option + Option->NextEntryOffset);
} }
if (status == STATUS_SUCCESS)
Config->Initialized = TRUE;
DbgEx(); DbgEx();
return status; return status;
} }
@ -2195,11 +2189,17 @@ NTSTATUS nfs41_CreateVNetRoot(
pNetRoot->MRxNetRootState = MRX_NET_ROOT_STATE_GOOD; pNetRoot->MRxNetRootState = MRX_NET_ROOT_STATE_GOOD;
pNetRoot->DeviceType = FILE_DEVICE_DISK; pNetRoot->DeviceType = FILE_DEVICE_DISK;
if (pNetRootContext->session) {
/* already established a session for this net root */
pVNetRootContext->session = pNetRootContext->session;
DbgP("Using existing session 0x%x\n", pVNetRootContext->session);
goto out;
}
nfs41_MountConfig_InitDefaults(&pVNetRootContext->Config); nfs41_MountConfig_InitDefaults(&pVNetRootContext->Config);
/* parse the extended attributes for mount options */ /* parse the extended attributes for mount options */
if (pCreateNetRootContext->RxContext->Create.EaLength && if (pCreateNetRootContext->RxContext->Create.EaLength)
!pNetRootContext->Config.Initialized)
{ {
DbgP("EaLength %d\n", pCreateNetRootContext->RxContext->Create.EaLength); DbgP("EaLength %d\n", pCreateNetRootContext->RxContext->Create.EaLength);
DbgP("parsing storing into vnetroot\n"); DbgP("parsing storing into vnetroot\n");
@ -2207,16 +2207,8 @@ NTSTATUS nfs41_CreateVNetRoot(
pCreateNetRootContext->RxContext->Create.EaBuffer, pCreateNetRootContext->RxContext->Create.EaBuffer,
pCreateNetRootContext->RxContext->Create.EaLength, pCreateNetRootContext->RxContext->Create.EaLength,
&pVNetRootContext->Config); &pVNetRootContext->Config);
if (status != STATUS_SUCCESS) { if (status != STATUS_SUCCESS)
if (pNetRootContext->Config.Initialized) {
DbgP("Using values from the NETROOT %p\n", pNetRootContext);
status = STATUS_SUCCESS;
RtlCopyMemory(&pVNetRootContext->Config, &pNetRootContext->Config,
sizeof(pNetRootContext->Config));
pVNetRootContext->session = pNetRootContext->session;
}
goto out; goto out;
}
// we need to save mount options in netroot not vnetroot!!!! // we need to save mount options in netroot not vnetroot!!!!
nfs41_MountConfig_InitDefaults(&pNetRootContext->Config); nfs41_MountConfig_InitDefaults(&pNetRootContext->Config);
@ -2237,15 +2229,10 @@ NTSTATUS nfs41_CreateVNetRoot(
else else
goto out; goto out;
} else { } else {
if (pNetRootContext->session == NULL) { DbgP("We dont have a valid existing session and we don't have a mount point!\n");
DbgP("We dont have a valid existing session and we don't have a mount point!\n"); status = STATUS_UNEXPECTED_NETWORK_ERROR;
status = STATUS_UNEXPECTED_NETWORK_ERROR; pNetRootContext->session = NULL;
pNetRootContext->session = NULL; goto out;
goto out;
}
RtlCopyMemory(&pVNetRootContext->Config, &pNetRootContext->Config,
sizeof(pNetRootContext->Config));
pVNetRootContext->session = pNetRootContext->session;
} }
DbgP("Saving point to nfs41_session 0x%x\n", pVNetRootContext->session); DbgP("Saving point to nfs41_session 0x%x\n", pVNetRootContext->session);