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

adding version to the upcall

Browse source 
to determine that the daemon has restarted -- rather that daemon is receiving upcalls from the kernel that were processed by the old instance of the daemon -- add a version to the upcall mechanism.

when daemon starts up it generates a version number (just a timestamp). it passes this value to the driver on start up via "start_ioctl" downcall. the driver saves that value in its device extensions. it uses that value in the mount and shtudown upcalls.

when daemon replies to the mount command it again sends its version as a part of the reply. this reply is stored in driver;s netroot extensions. the driver uses netroot's value in each upcall to the daemon.

if the daemon receives an upcall for an operation where the included version does not equal to the its current version, it fails the upcall (error_code=116).

a restart of the daemon would change driver's device extension value which the driver will then use in the new mount upcalls that would establish new sessions. then the correct daemon version would be returned as a part of the mount downcalled and saved in the netroot.
This commit is contained in:
Olga Kornievskaia 2010-11-05 20:08:55 -04:00 • committed by unknown
parent 765fb43156
commit a25a5221d9
7 changed files with 101 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/mount.c
View file

@ -106,9 +106,15 @@ out_err:
static int marshall_mount(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall) static int marshall_mount(unsigned char *buffer, uint32_t *length, nfs41_upcall *upcall)
{ {
int status;
mount_upcall_args *args = &upcall->args.mount; mount_upcall_args *args = &upcall->args.mount;
dprintf(2, "NFS41_MOUNT: writing pointer to nfs41_root %p\n", args->root); dprintf(2, "NFS41_MOUNT: writing pointer to nfs41_root %p and version %d\n",
return safe_write(&buffer, length, &args->root, sizeof(args->root)); args->root, NFS41D_VERSION);
status = safe_write(&buffer, length, &args->root, sizeof(args->root));
if (status) goto out;
status = safe_write(&buffer, length, &NFS41D_VERSION, sizeof(DWORD));
out:
return status;
} }
const nfs41_upcall_op nfs41_op_mount = { const nfs41_upcall_op nfs41_op_mount = {

22
daemon/nfs41_daemon.c
View file

@ -38,7 +38,7 @@
#include "util.h" #include "util.h"
#define MAX_NUM_THREADS 128 #define MAX_NUM_THREADS 128
BOOLEAN CREATED_SESSION = FALSE; DWORD NFS41D_VERSION = 0;
#ifndef STANDALONE_NFSD //make sure to define it in "sources" not here #ifndef STANDALONE_NFSD //make sure to define it in "sources" not here
#include "service.h" #include "service.h"
@ -115,16 +115,6 @@ static unsigned int WINAPI thread_main(void *args)
goto write_downcall; goto write_downcall;
} }
#if 1 //AGLO: this is just a placeholder for a real solution. I know this variable needs a lock in a
//normal case. However, this does not prevent us from receiving an upcall for an old mount
//that was not reestablished. It will only work for erroring requests until the 1st mount upcall.
if (!CREATED_SESSION && (upcall.opcode != NFS41_MOUNT && upcall.opcode != NFS41_SHUTDOWN)) {
eprintf("nfs41_daemon restarted and does not have a valid session established\n");
upcall.status = 116;
goto write_downcall;
}
#endif
if (upcall.opcode == NFS41_SHUTDOWN) { if (upcall.opcode == NFS41_SHUTDOWN) {
printf("Shutting down..\n"); printf("Shutting down..\n");
exit(0); exit(0);
@ -132,11 +122,6 @@ static unsigned int WINAPI thread_main(void *args)
status = upcall_handle(&upcall); status = upcall_handle(&upcall);
#if 1 //AGLO: place holder for a real solution
if (upcall.opcode == NFS41_MOUNT && upcall.status == NO_ERROR)
CREATED_SESSION = 1;
#endif
write_downcall: write_downcall:
dprintf(1, "writing downcall: xid=%d opcode=%s status=%d " dprintf(1, "writing downcall: xid=%d opcode=%s status=%d "
"get_last_error=%d\n", upcall.xid, opcode2string(upcall.opcode), "get_last_error=%d\n", upcall.xid, opcode2string(upcall.opcode),
@ -211,6 +196,9 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
goto out_logs; goto out_logs;
} }
NFS41D_VERSION = GetTickCount();
dprintf(1, "NFS41 Daemon starting: version %d\n", NFS41D_VERSION);
pipe = CreateFile(NFS41_USER_DEVICE_NAME_A, GENERIC_READ | GENERIC_WRITE, pipe = CreateFile(NFS41_USER_DEVICE_NAME_A, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING,
0, NULL); 0, NULL);
@ -222,7 +210,7 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv)
dprintf(1, "starting nfs41 mini redirector\n"); dprintf(1, "starting nfs41 mini redirector\n");
status = DeviceIoControl(pipe, IOCTL_NFS41_START, status = DeviceIoControl(pipe, IOCTL_NFS41_START,
NULL, 0, NULL, 0, (LPDWORD)&len, NULL); &NFS41D_VERSION, sizeof(DWORD), NULL, 0, (LPDWORD)&len, NULL);
if (!status) { if (!status) {
eprintf("IOCTL_NFS41_START failed with %d\n", eprintf("IOCTL_NFS41_START failed with %d\n",
GetLastError()); GetLastError());

11
daemon/upcall.c
View file

@ -72,6 +72,7 @@ int upcall_parse(
{ {
int status; int status;
const nfs41_upcall_op *op; const nfs41_upcall_op *op;
DWORD version;
ZeroMemory(upcall, sizeof(nfs41_upcall)); ZeroMemory(upcall, sizeof(nfs41_upcall));
if (!length) { if (!length) {
@ -84,12 +85,20 @@ int upcall_parse(
print_hexbuf(4, (unsigned char *)"upcall buffer: ", buffer, length); print_hexbuf(4, (unsigned char *)"upcall buffer: ", buffer, length);
/* parse common elements */ /* parse common elements */
status = safe_read(&buffer, &length, &version, sizeof(uint32_t));
if (status) goto out;
status = safe_read(&buffer, &length, &upcall->xid, sizeof(uint32_t)); status = safe_read(&buffer, &length, &upcall->xid, sizeof(uint32_t));
if (status) goto out; if (status) goto out;
status = safe_read(&buffer, &length, &upcall->opcode, sizeof(uint32_t)); status = safe_read(&buffer, &length, &upcall->opcode, sizeof(uint32_t));
if (status) goto out; if (status) goto out;
dprintf(2, "xid=%d opcode=%s\n", upcall->xid, opcode2string(upcall->opcode)); dprintf(2, "version=%d xid=%d opcode=%s\n", version, upcall->xid,
opcode2string(upcall->opcode));
if (version != NFS41D_VERSION) {
eprintf("received version %d expecting version %d\n", version, NFS41D_VERSION);
upcall->status = status = 116;
goto out;
}
if (upcall->opcode >= g_upcall_op_table_size) { if (upcall->opcode >= g_upcall_op_table_size) {
status = ERROR_NOT_SUPPORTED; status = ERROR_NOT_SUPPORTED;

1
daemon/upcall.h
View file

@ -27,7 +27,6 @@
#include "nfs41_ops.h" #include "nfs41_ops.h"
#include "from_kernel.h" #include "from_kernel.h"
/* structures for upcall arguments */ /* structures for upcall arguments */
typedef struct __mount_upcall_args { typedef struct __mount_upcall_args {
const char *hostname; const char *hostname;

2
daemon/util.h
View file

@ -26,7 +26,7 @@
#include "nfs41_types.h" #include "nfs41_types.h"
extern DWORD NFS41D_VERSION;
struct __nfs41_session; struct __nfs41_session;
struct __nfs41_write_verf; struct __nfs41_write_verf;
enum stable_how4; enum stable_how4;

88
sys/nfs41_driver.c
View file

@ -107,6 +107,7 @@ typedef enum _nfs41_updowncall_state {
} nfs41_updowncall_state; } nfs41_updowncall_state;
typedef struct _updowncall_entry { typedef struct _updowncall_entry {
DWORD version;
DWORD xid; DWORD xid;
DWORD opcode; DWORD opcode;
NTSTATUS status; NTSTATUS status;
@ -284,6 +285,7 @@ typedef struct _NFS41_NETROOT_EXTENSION {
NODE_TYPE_CODE NodeTypeCode; NODE_TYPE_CODE NodeTypeCode;
NODE_BYTE_SIZE NodeByteSize; NODE_BYTE_SIZE NodeByteSize;
HANDLE session; HANDLE session;
DWORD nfs41d_version;
} 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))
@ -345,6 +347,7 @@ typedef struct _NFS41_DEVICE_EXTENSION {
PRDBSS_DEVICE_OBJECT DeviceObject; PRDBSS_DEVICE_OBJECT DeviceObject;
ULONG ActiveNodes; ULONG ActiveNodes;
HANDLE SharedMemorySection; HANDLE SharedMemorySection;
DWORD nfs41d_version;
} NFS41_DEVICE_EXTENSION, *PNFS41_DEVICE_EXTENSION; } NFS41_DEVICE_EXTENSION, *PNFS41_DEVICE_EXTENSION;
#define NFS41GetDeviceExtension(RxContext,pExt) \ #define NFS41GetDeviceExtension(RxContext,pExt) \
@ -452,18 +455,21 @@ NTSTATUS marshal_nfs41_header(nfs41_updowncall_entry *entry,
ULONG header_len = 0; ULONG header_len = 0;
unsigned char *tmp = buf; unsigned char *tmp = buf;
header_len = sizeof(entry->xid) + sizeof(entry->opcode); header_len = sizeof(entry->version) + sizeof(entry->xid) + sizeof(entry->opcode);
if (header_len > buf_len) { if (header_len > buf_len) {
status = STATUS_INSUFFICIENT_RESOURCES; status = STATUS_INSUFFICIENT_RESOURCES;
goto out; goto out;
} }
else else
*len = header_len; *len = header_len;
RtlCopyMemory(tmp, &entry->version, sizeof(entry->version));
tmp += sizeof(DWORD);
RtlCopyMemory(tmp, &entry->xid, sizeof(entry->xid)); RtlCopyMemory(tmp, &entry->xid, sizeof(entry->xid));
tmp += sizeof(xid); tmp += sizeof(xid);
RtlCopyMemory(tmp, &entry->opcode, sizeof(entry->opcode)); RtlCopyMemory(tmp, &entry->opcode, sizeof(entry->opcode));
DbgP("[upcall] entry=%p xid=%d opcode=%d\n", entry, entry->xid, entry->opcode); DbgP("[upcall] entry=%p xid=%d opcode=%d version=%d\n", entry, entry->xid,
entry->opcode, entry->version);
out: out:
return status; return status;
} }
@ -1359,7 +1365,9 @@ nfs41_downcall (
switch (tmp->opcode) { switch (tmp->opcode) {
case NFS41_MOUNT: case NFS41_MOUNT:
RtlCopyMemory(&cur->u.Mount.session, buf, sizeof(HANDLE)); RtlCopyMemory(&cur->u.Mount.session, buf, sizeof(HANDLE));
DbgP("[mount] session pointer 0x%x\n", cur->u.Mount.session); buf += sizeof(HANDLE);
RtlCopyMemory(&cur->version, buf, sizeof(DWORD));
DbgP("[mount] session pointer 0x%x version %d\n", cur->u.Mount.session, cur->version);
break; break;
case NFS41_WRITE: case NFS41_WRITE:
case NFS41_READ: case NFS41_READ:
@ -1472,7 +1480,7 @@ out:
return status; return status;
} }
NTSTATUS nfs41_shutdown_daemon() NTSTATUS nfs41_shutdown_daemon(DWORD version)
{ {
NTSTATUS status = STATUS_SUCCESS; NTSTATUS status = STATUS_SUCCESS;
nfs41_updowncall_entry *entry = NULL; nfs41_updowncall_entry *entry = NULL;
@ -1481,6 +1489,7 @@ NTSTATUS nfs41_shutdown_daemon()
status = nfs41_UpcallCreate(NFS41_SHUTDOWN, &entry); status = nfs41_UpcallCreate(NFS41_SHUTDOWN, &entry);
if (status) if (status)
goto out; goto out;
entry->version = version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -1723,7 +1732,7 @@ out:
return status; return status;
} }
NTSTATUS nfs41_unmount(HANDLE session) NTSTATUS nfs41_unmount(HANDLE session, DWORD version)
{ {
NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES; NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES;
nfs41_updowncall_entry *entry; nfs41_updowncall_entry *entry;
@ -1733,6 +1742,7 @@ NTSTATUS nfs41_unmount(HANDLE session)
if (status) if (status)
goto out; goto out;
entry->u.Mount.session = session; entry->u.Mount.session = session;
entry->version = version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -1812,6 +1822,10 @@ NTSTATUS nfs41_DevFcbXXXControlFile(
PLOWIO_CONTEXT io_ctx = &RxContext->LowIoContext; PLOWIO_CONTEXT io_ctx = &RxContext->LowIoContext;
ULONG fsop = io_ctx->ParamsFor.FsCtl.FsControlCode; ULONG fsop = io_ctx->ParamsFor.FsCtl.FsControlCode;
ULONG state; ULONG state;
ULONG in_len = io_ctx->ParamsFor.IoCtl.InputBufferLength;
DWORD *buf = io_ctx->ParamsFor.IoCtl.pInputBuffer;
NFS41GetDeviceExtension(RxContext, DevExt);
DWORD nfs41d_version = 0;
//DbgEn(); //DbgEn();
@ -1866,6 +1880,12 @@ NTSTATUS nfs41_DevFcbXXXControlFile(
break; break;
case IOCTL_NFS41_START: case IOCTL_NFS41_START:
print_driver_state(nfs41_start_state); print_driver_state(nfs41_start_state);
if (in_len >= sizeof(DWORD)) {
RtlCopyMemory(&nfs41d_version, buf, sizeof(DWORD));
DbgP("NFS41 Daemon sent start request with version %d\n", nfs41d_version);
DbgP("Currently used NFS41 Daemon version is %d\n", DevExt->nfs41d_version);
DevExt->nfs41d_version = nfs41d_version;
}
switch(nfs41_start_state) { switch(nfs41_start_state) {
case NFS41_START_DRIVER_STARTABLE: case NFS41_START_DRIVER_STARTABLE:
(nfs41_start_driver_state)InterlockedCompareExchange( (nfs41_start_driver_state)InterlockedCompareExchange(
@ -1893,7 +1913,7 @@ NTSTATUS nfs41_DevFcbXXXControlFile(
break; break;
case IOCTL_NFS41_STOP: case IOCTL_NFS41_STOP:
if (nfs41_start_state == NFS41_START_DRIVER_STARTED) if (nfs41_start_state == NFS41_START_DRIVER_STARTED)
nfs41_shutdown_daemon(); nfs41_shutdown_daemon(DevExt->nfs41d_version);
if (RxContext->RxDeviceObject->NumberOfActiveFcbs > 0) { if (RxContext->RxDeviceObject->NumberOfActiveFcbs > 0) {
DbgP("device has open handles %d\n", DbgP("device has open handles %d\n",
RxContext->RxDeviceObject->NumberOfActiveFcbs); RxContext->RxDeviceObject->NumberOfActiveFcbs);
@ -2058,7 +2078,8 @@ static NTSTATUS map_mount_errors(DWORD status)
} }
} }
NTSTATUS nfs41_mount(PUNICODE_STRING srv_name, PUNICODE_STRING root, PHANDLE session) NTSTATUS nfs41_mount(PUNICODE_STRING srv_name, PUNICODE_STRING root,
PHANDLE session, DWORD *version)
{ {
NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES; NTSTATUS status = STATUS_INSUFFICIENT_RESOURCES;
nfs41_updowncall_entry *entry; nfs41_updowncall_entry *entry;
@ -2069,6 +2090,7 @@ NTSTATUS nfs41_mount(PUNICODE_STRING srv_name, PUNICODE_STRING root, PHANDLE ses
goto out; goto out;
entry->u.Mount.srv_name = srv_name; entry->u.Mount.srv_name = srv_name;
entry->u.Mount.root = root; entry->u.Mount.root = root;
entry->version = *version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -2078,6 +2100,8 @@ NTSTATUS nfs41_mount(PUNICODE_STRING srv_name, PUNICODE_STRING root, PHANDLE ses
/* map windows ERRORs to NTSTATUS */ /* map windows ERRORs to NTSTATUS */
status = map_mount_errors(entry->status); status = map_mount_errors(entry->status);
if (status == STATUS_SUCCESS)
*version = entry->version;
RxFreePool(entry); RxFreePool(entry);
out: out:
DbgEx(); DbgEx();
@ -2253,7 +2277,8 @@ NTSTATUS nfs41_CreateVNetRoot(
NFS41GetVNetRootExtension(pVNetRoot); NFS41GetVNetRootExtension(pVNetRoot);
PNFS41_NETROOT_EXTENSION pNetRootContext = PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(pNetRoot); NFS41GetNetRootExtension(pNetRoot);
NFS41GetDeviceExtension(pCreateNetRootContext->RxContext,DevExt);
DWORD nfs41d_version = DevExt->nfs41d_version;
ASSERT((NodeType(pNetRoot) == RDBSS_NTC_NETROOT) && ASSERT((NodeType(pNetRoot) == RDBSS_NTC_NETROOT) &&
(NodeType(pNetRoot->pSrvCall) == RDBSS_NTC_SRVCALL)); (NodeType(pNetRoot->pSrvCall) == RDBSS_NTC_SRVCALL));
@ -2317,10 +2342,10 @@ NTSTATUS nfs41_CreateVNetRoot(
DbgP("Server Name %wZ Mount Point %wZ\n", DbgP("Server Name %wZ Mount Point %wZ\n",
&Config.SrvName, &Config.MntPt); &Config.SrvName, &Config.MntPt);
status = nfs41_mount(&Config.SrvName, &Config.MntPt, status = nfs41_mount(&Config.SrvName, &Config.MntPt,
&pVNetRootContext->session); &pVNetRootContext->session, &nfs41d_version);
if (status != STATUS_SUCCESS) if (status != STATUS_SUCCESS)
goto out; goto out;
pNetRootContext->nfs41d_version = nfs41d_version;
pNetRootContext->session = pVNetRootContext->session; pNetRootContext->session = pVNetRootContext->session;
DbgP("Saving new session 0x%x\n", pVNetRootContext->session); DbgP("Saving new session 0x%x\n", pVNetRootContext->session);
@ -2409,7 +2434,7 @@ NTSTATUS nfs41_FinalizeNetRoot(
PNFS41_NETROOT_EXTENSION pNetRootContext = PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension((PMRX_NET_ROOT)pNetRoot); NFS41GetNetRootExtension((PMRX_NET_ROOT)pNetRoot);
nfs41_updowncall_entry *tmp; nfs41_updowncall_entry *tmp;
DbgEn(); DbgEn();
print_net_root(1, pNetRoot); print_net_root(1, pNetRoot);
@ -2429,7 +2454,7 @@ NTSTATUS nfs41_FinalizeNetRoot(
goto out; goto out;
} }
status = nfs41_unmount(pNetRootContext->session); status = nfs41_unmount(pNetRootContext->session, pNetRootContext->nfs41d_version);
if (status) { if (status) {
print_error("nfs41_mount failed with %d\n", status); print_error("nfs41_mount failed with %d\n", status);
goto out; goto out;
@ -2608,6 +2633,7 @@ NTSTATUS nfs41_Create(
entry->u.Open.disp = params.Disposition; entry->u.Open.disp = params.Disposition;
entry->u.Open.copts = params.CreateOptions; entry->u.Open.copts = params.CreateOptions;
entry->u.Open.session = pVNetRootContext->session; entry->u.Open.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (isDataAccess(params.DesiredAccess)) if (isDataAccess(params.DesiredAccess))
entry->u.Open.open_owner_id = get_next_open_owner(); entry->u.Open.open_owner_id = get_next_open_owner();
// if we are creating a file check if nfsv3attributes were passed in // if we are creating a file check if nfsv3attributes were passed in
@ -2906,6 +2932,8 @@ NTSTATUS nfs41_CloseSrvOpen (
PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context; PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_close_args(RxContext); print_close_args(RxContext);
@ -2915,6 +2943,7 @@ NTSTATUS nfs41_CloseSrvOpen (
goto out; goto out;
entry->u.Close.open_state = nfs41_fobx->nfs41_open_state; entry->u.Close.open_state = nfs41_fobx->nfs41_open_state;
entry->u.Close.session = pVNetRootContext->session; entry->u.Close.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (!RxContext->pFcb->OpenCount) { if (!RxContext->pFcb->OpenCount) {
entry->u.Close.remove = nfs41_fcb->StandardInfo.DeletePending; entry->u.Close.remove = nfs41_fcb->StandardInfo.DeletePending;
entry->u.Close.renamed = nfs41_fcb->Renamed; entry->u.Close.renamed = nfs41_fcb->Renamed;
@ -3040,6 +3069,8 @@ NTSTATUS nfs41_QueryDirectory (
__notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen; __notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen;
PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_querydir_args(RxContext); print_querydir_args(RxContext);
@ -3071,6 +3102,7 @@ NTSTATUS nfs41_QueryDirectory (
entry->u.QueryFile.restart_scan = RxContext->QueryDirectory.RestartScan; entry->u.QueryFile.restart_scan = RxContext->QueryDirectory.RestartScan;
entry->u.QueryFile.return_single = RxContext->QueryDirectory.ReturnSingleEntry; entry->u.QueryFile.return_single = RxContext->QueryDirectory.ReturnSingleEntry;
entry->u.QueryFile.session = pVNetRootContext->session; entry->u.QueryFile.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -3132,6 +3164,8 @@ NTSTATUS nfs41_QueryVolumeInformation (
PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
nfs41_updowncall_entry *entry; nfs41_updowncall_entry *entry;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_queryvolume_args(RxContext); print_queryvolume_args(RxContext);
@ -3214,6 +3248,7 @@ NTSTATUS nfs41_QueryVolumeInformation (
entry->u.Volume.query = InfoClass; entry->u.Volume.query = InfoClass;
entry->u.Volume.buf = RxContext->Info.Buffer; entry->u.Volume.buf = RxContext->Info.Buffer;
entry->u.Volume.buf_len = RxContext->Info.LengthRemaining; entry->u.Volume.buf_len = RxContext->Info.LengthRemaining;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -3400,6 +3435,8 @@ NTSTATUS nfs41_SetEaInformation (
PFILE_FULL_EA_INFORMATION eainfo = PFILE_FULL_EA_INFORMATION eainfo =
(PFILE_FULL_EA_INFORMATION)RxContext->Info.Buffer; (PFILE_FULL_EA_INFORMATION)RxContext->Info.Buffer;
nfs3_attrs *attrs = NULL; nfs3_attrs *attrs = NULL;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_debug_header(RxContext); print_debug_header(RxContext);
@ -3418,6 +3455,7 @@ NTSTATUS nfs41_SetEaInformation (
entry->u.SetEa.open_state = nfs41_fobx->nfs41_open_state; entry->u.SetEa.open_state = nfs41_fobx->nfs41_open_state;
entry->u.SetEa.session = pVNetRootContext->session; entry->u.SetEa.session = pVNetRootContext->session;
entry->u.SetEa.mode = attrs->mode; entry->u.SetEa.mode = attrs->mode;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -3505,6 +3543,8 @@ NTSTATUS nfs41_QueryFileInformation (
PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context; PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
switch (InfoClass) { switch (InfoClass) {
@ -3566,6 +3606,7 @@ NTSTATUS nfs41_QueryFileInformation (
entry->u.QueryFile.buf = RxContext->Info.Buffer; entry->u.QueryFile.buf = RxContext->Info.Buffer;
entry->u.QueryFile.buf_len = RxContext->Info.LengthRemaining; entry->u.QueryFile.buf_len = RxContext->Info.LengthRemaining;
entry->u.QueryFile.session = pVNetRootContext->session; entry->u.QueryFile.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -3673,6 +3714,8 @@ NTSTATUS nfs41_SetFileInformation (
PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context; PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context;
FILE_RENAME_INFORMATION rinfo; FILE_RENAME_INFORMATION rinfo;
PFILE_OBJECT fo = RxContext->CurrentIrpSp->FileObject; PFILE_OBJECT fo = RxContext->CurrentIrpSp->FileObject;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_setfile_args(RxContext); print_setfile_args(RxContext);
@ -3753,6 +3796,8 @@ NTSTATUS nfs41_SetFileInformation (
entry->u.SetFile.open_state = nfs41_fobx->nfs41_open_state; entry->u.SetFile.open_state = nfs41_fobx->nfs41_open_state;
entry->u.SetFile.filename = FileName; entry->u.SetFile.filename = FileName;
entry->u.SetFile.InfoClass = InfoClass; entry->u.SetFile.InfoClass = InfoClass;
entry->version = pNetRootContext->nfs41d_version;
switch(InfoClass) { switch(InfoClass) {
case FileAllocationInformation: case FileAllocationInformation:
case FileEndOfFileInformation: case FileEndOfFileInformation:
@ -3928,6 +3973,8 @@ NTSTATUS nfs41_Read (
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context; PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context;
BOOLEAN async = FALSE; BOOLEAN async = FALSE;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_readwrite_args(RxContext); print_readwrite_args(RxContext);
@ -3940,6 +3987,7 @@ NTSTATUS nfs41_Read (
entry->u.ReadWrite.len = LowIoContext->ParamsFor.ReadWrite.ByteCount; entry->u.ReadWrite.len = LowIoContext->ParamsFor.ReadWrite.ByteCount;
entry->u.ReadWrite.offset = LowIoContext->ParamsFor.ReadWrite.ByteOffset; entry->u.ReadWrite.offset = LowIoContext->ParamsFor.ReadWrite.ByteOffset;
entry->u.ReadWrite.session = pVNetRootContext->session; entry->u.ReadWrite.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (FlagOn(RxContext->CurrentIrpSp->FileObject->Flags, FO_SYNCHRONOUS_IO) == FALSE) { if (FlagOn(RxContext->CurrentIrpSp->FileObject->Flags, FO_SYNCHRONOUS_IO) == FALSE) {
entry->u.ReadWrite.rxcontext = RxContext; entry->u.ReadWrite.rxcontext = RxContext;
async = entry->async_op = TRUE; async = entry->async_op = TRUE;
@ -3990,6 +4038,8 @@ NTSTATUS nfs41_Write (
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context; PNFS41_FCB nfs41_fcb = (PNFS41_FCB)(RxContext->pFcb)->Context;
BOOLEAN async = FALSE; BOOLEAN async = FALSE;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_readwrite_args(RxContext); print_readwrite_args(RxContext);
@ -4002,6 +4052,8 @@ NTSTATUS nfs41_Write (
entry->u.ReadWrite.len = LowIoContext->ParamsFor.ReadWrite.ByteCount; entry->u.ReadWrite.len = LowIoContext->ParamsFor.ReadWrite.ByteCount;
entry->u.ReadWrite.offset = LowIoContext->ParamsFor.ReadWrite.ByteOffset; entry->u.ReadWrite.offset = LowIoContext->ParamsFor.ReadWrite.ByteOffset;
entry->u.ReadWrite.session = pVNetRootContext->session; entry->u.ReadWrite.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (FlagOn(RxContext->CurrentIrpSp->FileObject->Flags, FO_SYNCHRONOUS_IO) == FALSE) { if (FlagOn(RxContext->CurrentIrpSp->FileObject->Flags, FO_SYNCHRONOUS_IO) == FALSE) {
entry->u.ReadWrite.rxcontext = RxContext; entry->u.ReadWrite.rxcontext = RxContext;
async = entry->async_op = TRUE; async = entry->async_op = TRUE;
@ -4122,6 +4174,8 @@ NTSTATUS nfs41_Lock(
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
const ULONG flags = LowIoContext->ParamsFor.Locks.Flags; const ULONG flags = LowIoContext->ParamsFor.Locks.Flags;
LARGE_INTEGER poll_delay = {0}; LARGE_INTEGER poll_delay = {0};
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_lock_args(RxContext); print_lock_args(RxContext);
@ -4138,6 +4192,7 @@ NTSTATUS nfs41_Lock(
entry->u.Lock.length = LowIoContext->ParamsFor.Locks.Length; entry->u.Lock.length = LowIoContext->ParamsFor.Locks.Length;
entry->u.Lock.exclusive = BooleanFlagOn(flags, SL_EXCLUSIVE_LOCK); entry->u.Lock.exclusive = BooleanFlagOn(flags, SL_EXCLUSIVE_LOCK);
entry->u.Lock.blocking = !BooleanFlagOn(flags, SL_FAIL_IMMEDIATELY); entry->u.Lock.blocking = !BooleanFlagOn(flags, SL_FAIL_IMMEDIATELY);
entry->version = pNetRootContext->nfs41d_version;
retry_upcall: retry_upcall:
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
@ -4203,6 +4258,8 @@ NTSTATUS nfs41_Unlock(
__notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen; __notnull PMRX_SRV_OPEN SrvOpen = RxContext->pRelevantSrvOpen;
PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext = PNFS41_V_NET_ROOT_EXTENSION pVNetRootContext =
NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_lock_args(RxContext); print_lock_args(RxContext);
@ -4215,6 +4272,7 @@ NTSTATUS nfs41_Unlock(
goto out; goto out;
entry->u.Unlock.open_state = nfs41_fobx->nfs41_open_state; entry->u.Unlock.open_state = nfs41_fobx->nfs41_open_state;
entry->u.Unlock.session = pVNetRootContext->session; entry->u.Unlock.session = pVNetRootContext->session;
entry->version = pNetRootContext->nfs41d_version;
if (LowIoContext->Operation == LOWIO_OP_UNLOCK_MULTIPLE) { if (LowIoContext->Operation == LOWIO_OP_UNLOCK_MULTIPLE) {
entry->u.Unlock.count = unlock_list_count( entry->u.Unlock.count = unlock_list_count(
@ -4296,6 +4354,8 @@ static NTSTATUS nfs41_SetReparsePoint(
PNFS41_V_NET_ROOT_EXTENSION VNetRoot = NFS41GetVNetRootExtension(SrvOpen->pVNetRoot); PNFS41_V_NET_ROOT_EXTENSION VNetRoot = NFS41GetVNetRootExtension(SrvOpen->pVNetRoot);
nfs41_updowncall_entry *entry; nfs41_updowncall_entry *entry;
NTSTATUS status; NTSTATUS status;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
print_reparse_buffer(Reparse); print_reparse_buffer(Reparse);
@ -4319,6 +4379,7 @@ static NTSTATUS nfs41_SetReparsePoint(
entry->u.Symlink.filename = SrvOpen->pAlreadyPrefixedName; entry->u.Symlink.filename = SrvOpen->pAlreadyPrefixedName;
entry->u.Symlink.target = &TargetName; entry->u.Symlink.target = &TargetName;
entry->u.Symlink.set = TRUE; entry->u.Symlink.set = TRUE;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;
@ -4343,6 +4404,8 @@ static NTSTATUS nfs41_GetReparsePoint(
const USHORT HeaderLen = FIELD_OFFSET(REPARSE_DATA_BUFFER, const USHORT HeaderLen = FIELD_OFFSET(REPARSE_DATA_BUFFER,
SymbolicLinkReparseBuffer.PathBuffer); SymbolicLinkReparseBuffer.PathBuffer);
NTSTATUS status; NTSTATUS status;
PNFS41_NETROOT_EXTENSION pNetRootContext =
NFS41GetNetRootExtension(SrvOpen->pVNetRoot->pNetRoot);
DbgEn(); DbgEn();
@ -4371,6 +4434,7 @@ static NTSTATUS nfs41_GetReparsePoint(
entry->u.Symlink.filename = SrvOpen->pAlreadyPrefixedName; entry->u.Symlink.filename = SrvOpen->pAlreadyPrefixedName;
entry->u.Symlink.target = &TargetName; entry->u.Symlink.target = &TargetName;
entry->u.Symlink.set = FALSE; entry->u.Symlink.set = FALSE;
entry->version = pNetRootContext->nfs41d_version;
if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) { if (nfs41_UpcallWaitForReply(entry) != STATUS_SUCCESS) {
status = STATUS_INTERNAL_ERROR; status = STATUS_INTERNAL_ERROR;

2
sys/nfs41_driver.h
View file

@ -42,7 +42,7 @@
#define _RDR_CTL_CODE(code, method) \ #define _RDR_CTL_CODE(code, method) \
CTL_CODE(FILE_DEVICE_NETWORK_REDIRECTOR, 0x800 | (code), method, FILE_ANY_ACCESS) CTL_CODE(FILE_DEVICE_NETWORK_REDIRECTOR, 0x800 | (code), method, FILE_ANY_ACCESS)
#define IOCTL_NFS41_START _RDR_CTL_CODE(0, METHOD_NEITHER) #define IOCTL_NFS41_START _RDR_CTL_CODE(0, METHOD_BUFFERED)
#define IOCTL_NFS41_STOP _RDR_CTL_CODE(1, METHOD_NEITHER) #define IOCTL_NFS41_STOP _RDR_CTL_CODE(1, METHOD_NEITHER)
#define IOCTL_NFS41_GETSTATE _RDR_CTL_CODE(3, METHOD_NEITHER) #define IOCTL_NFS41_GETSTATE _RDR_CTL_CODE(3, METHOD_NEITHER)
#define IOCTL_NFS41_ADDCONN _RDR_CTL_CODE(4, METHOD_BUFFERED) #define IOCTL_NFS41_ADDCONN _RDR_CTL_CODE(4, METHOD_BUFFERED)