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

driver: make mount upcalls for shared mounts

Browse source 
even if CreateVNetRoot() finds an existing compatible mount, make a MOUNT upcall and pass that session to the daemon.  the daemon can avoid creating a new root/client/seession, but still has a chance to verify the mount path with LOOKUPs and fetch fs attributes for the new VNetRoot

when the daemon is given an existing root, handle_mount() avoids any extra reference counting on it.  while we can make multiple MOUNT upcalls on a shared mount, we'll still only send the one UNMOUNT upcall on FinalizeNetRoot()

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2012-05-04 11:32:31 -04:00 • committed by unknown
parent b48871d807
commit f6e02ff4a0
2 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/mount.c
View file

@ -69,6 +69,12 @@ static int handle_mount(nfs41_upcall *upcall)
eprintf("nfs41_server_resolve() failed with %d\n", status); eprintf("nfs41_server_resolve() failed with %d\n", status);
goto out; goto out;
} }
if (upcall->root_ref != INVALID_HANDLE_VALUE) {
/* use an existing root from a previous mount, but don't take an
* extra reference; we'll only get one UNMOUNT upcall for each root */
root = upcall->root_ref;
} else {
// create root // create root
status = nfs41_root_create(args->hostname, args->sec_flavor, status = nfs41_root_create(args->hostname, args->sec_flavor,
args->wsize + WRITE_OVERHEAD, args->rsize + READ_OVERHEAD, &root); args->wsize + WRITE_OVERHEAD, args->rsize + READ_OVERHEAD, &root);
@ -76,10 +82,11 @@ static int handle_mount(nfs41_upcall *upcall)
eprintf("nfs41_root_create() failed %d\n", status); eprintf("nfs41_root_create() failed %d\n", status);
goto out; goto out;
} }
// add a mount
root->uid = upcall->uid; root->uid = upcall->uid;
root->gid = upcall->gid; root->gid = upcall->gid;
}
// find or create the client/session
status = nfs41_root_mount_addrs(root, &addrs, 0, 0, &client); status = nfs41_root_mount_addrs(root, &addrs, 0, 0, &client);
if (status) { if (status) {
eprintf("nfs41_root_mount_addrs() failed with %d\n", status); eprintf("nfs41_root_mount_addrs() failed with %d\n", status);
@ -89,7 +96,7 @@ static int handle_mount(nfs41_upcall *upcall)
// make a copy of the path for nfs41_lookup() // make a copy of the path for nfs41_lookup()
InitializeSRWLock(&path.lock); InitializeSRWLock(&path.lock);
if (FAILED(StringCchCopyA(path.path, NFS41_MAX_PATH_LEN, args->path))) { if (FAILED(StringCchCopyA(path.path, NFS41_MAX_PATH_LEN, args->path))) {
status = ERROR_BUFFER_OVERFLOW; status = ERROR_FILENAME_EXCED_RANGE;
goto out_err; goto out_err;
} }
path.len = (unsigned short)strlen(path.path); path.len = (unsigned short)strlen(path.path);
@ -105,13 +112,15 @@ static int handle_mount(nfs41_upcall *upcall)
nfs41_superblock_fs_attributes(file.fh.superblock, &args->FsAttrs); nfs41_superblock_fs_attributes(file.fh.superblock, &args->FsAttrs);
if (upcall->root_ref == INVALID_HANDLE_VALUE)
nfs41_root_ref(root);
upcall->root_ref = root; upcall->root_ref = root;
nfs41_root_ref(upcall->root_ref);
args->lease_time = client->session->lease_time; args->lease_time = client->session->lease_time;
out: out:
return status; return status;
out_err: out_err:
if (upcall->root_ref == INVALID_HANDLE_VALUE)
nfs41_root_deref(root); nfs41_root_deref(root);
goto out; goto out;
} }

6
sys/nfs41_driver.c
View file

@ -2619,7 +2619,7 @@ NTSTATUS nfs41_mount(
DbgP("Server Name %wZ Mount Point %wZ SecFlavor %d\n", DbgP("Server Name %wZ Mount Point %wZ SecFlavor %d\n",
&config->SrvName, &config->MntPt, sec_flavor); &config->SrvName, &config->MntPt, sec_flavor);
#endif #endif
status = nfs41_UpcallCreate(NFS41_MOUNT, NULL, INVALID_HANDLE_VALUE, status = nfs41_UpcallCreate(NFS41_MOUNT, NULL, *session,
INVALID_HANDLE_VALUE, *version, &config->MntPt, &entry); INVALID_HANDLE_VALUE, *version, &config->MntPt, &entry);
if (status) goto out; if (status) goto out;
@ -3050,7 +3050,6 @@ NTSTATUS nfs41_CreateVNetRoot(
#endif #endif
} }
if (!found_existing_mount || !found_matching_flavor) {
/* send the mount upcall */ /* send the mount upcall */
status = nfs41_mount(Config, pVNetRootContext->sec_flavor, status = nfs41_mount(Config, pVNetRootContext->sec_flavor,
&pVNetRootContext->session, &nfs41d_version, &pVNetRootContext->session, &nfs41d_version,
@ -3059,14 +3058,13 @@ NTSTATUS nfs41_CreateVNetRoot(
if (!found_existing_mount && if (!found_existing_mount &&
IsListEmpty(&pNetRootContext->mounts.head)) { IsListEmpty(&pNetRootContext->mounts.head)) {
pNetRootContext->mounts_init = FALSE; pNetRootContext->mounts_init = FALSE;
pVNetRootContext->session = INVALID_HANDLE_VALUE;
} }
pVNetRootContext->session = INVALID_HANDLE_VALUE;
goto out_free; goto out_free;
} }
pVNetRootContext->timeout = Config->timeout; pVNetRootContext->timeout = Config->timeout;
RtlCopyMemory(&pNetRootContext->FsAttrs, &pVNetRootContext->FsAttrs, RtlCopyMemory(&pNetRootContext->FsAttrs, &pVNetRootContext->FsAttrs,
sizeof(pVNetRootContext->FsAttrs)); sizeof(pVNetRootContext->FsAttrs));
}
if (!found_existing_mount) { if (!found_existing_mount) {
/* create a new mount entry and add it to the list */ /* create a new mount entry and add it to the list */