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

dont call upcall_cleanup if versions were mismatched

Browse source
This commit is contained in:
Olga Kornievskaia 2011-04-27 16:47:40 -04:00
parent a173395b5a
commit 3a69a29ff6
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/nfs41_daemon.c
View file

@ -144,7 +144,8 @@ write_downcall:
GetLastError(), upcall.xid, opcode2string(upcall.opcode)); GetLastError(), upcall.xid, opcode2string(upcall.opcode));
upcall_cancel(&upcall); upcall_cancel(&upcall);
} }
upcall_cleanup(&upcall); if (upcall.status != NFSD_VERSION_MISMATCH)
upcall_cleanup(&upcall);
} }
CloseHandle(pipe); CloseHandle(pipe);

3
daemon/upcall.c
View file

@ -28,9 +28,6 @@
#include "daemon_debug.h" #include "daemon_debug.h"
#include "util.h" #include "util.h"
#define NFSD_VERSION_MISMATCH 116
extern const nfs41_upcall_op nfs41_op_mount; extern const nfs41_upcall_op nfs41_op_mount;
extern const nfs41_upcall_op nfs41_op_unmount; extern const nfs41_upcall_op nfs41_op_unmount;
extern const nfs41_upcall_op nfs41_op_open; extern const nfs41_upcall_op nfs41_op_open;

2
daemon/upcall.h
View file

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