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

[driver] using InterlockedIncrement64 for xid

Browse source
This commit is contained in:
Olga Kornievskaia 2011-12-21 17:19:38 -05:00
parent 4511dec4b7
commit 9efa410e5a
6 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/nfs41_daemon.c
View file

@ -128,7 +128,7 @@ static unsigned int WINAPI thread_main(void *args)
status = upcall_handle(&upcall);
write_downcall:
dprintf(1, "writing downcall: xid=%d opcode=%s status=%d "
dprintf(1, "writing downcall: xid=%lld opcode=%s status=%d "
"get_last_error=%d\n", upcall.xid, opcode2string(upcall.opcode),
upcall.status, upcall.last_error);
@ -138,7 +138,7 @@ write_downcall:
status = DeviceIoControl(pipe, IOCTL_NFS41_WRITE,
inbuf, inbuf_len, NULL, 0, (LPDWORD)&outbuf_len, NULL);
if (!status) {
eprintf("IOCTL_NFS41_WRITE failed with %d xid=%d opcode=%s\n",
eprintf("IOCTL_NFS41_WRITE failed with %d xid=%lld opcode=%s\n",
GetLastError(), upcall.xid, opcode2string(upcall.opcode));
upcall_cancel(&upcall);
}

2
daemon/upcall.c
View file

@ -95,7 +95,7 @@ int upcall_parse(
/* 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(uint64_t));
if (status) goto out;
status = safe_read(&buffer, &length, &upcall->opcode, sizeof(uint32_t));
if (status) goto out;

2
daemon/upcall.h
View file

@ -184,7 +184,7 @@ typedef union __upcall_args {
} upcall_args;
typedef struct __nfs41_upcall {
uint32_t xid;
uint64_t xid;
uint32_t opcode;
uint32_t status;
uint32_t last_error;