From 3a69a29ff6ddb23e0443eb3ab1bb0cd2f02ad420 Mon Sep 17 00:00:00 2001
From: Olga Kornievskaia <aglo@citi.umich.edu>
Date: Wed, 27 Apr 2011 16:47:40 -0400
Subject: [PATCH] dont call upcall_cleanup if versions were mismatched

---
 daemon/nfs41_daemon.c | 3 ++-
 daemon/upcall.c       | 3 ---
 daemon/upcall.h       | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c
index 2ab1c80..48d29bd 100644
--- a/daemon/nfs41_daemon.c
+++ b/daemon/nfs41_daemon.c
@@ -144,7 +144,8 @@ write_downcall:
                 GetLastError(), upcall.xid, opcode2string(upcall.opcode));
             upcall_cancel(&upcall);
         }
-        upcall_cleanup(&upcall);
+        if (upcall.status != NFSD_VERSION_MISMATCH)
+            upcall_cleanup(&upcall);
     }
     CloseHandle(pipe);
 
diff --git a/daemon/upcall.c b/daemon/upcall.c
index cea824a..e95fcb4 100644
--- a/daemon/upcall.c
+++ b/daemon/upcall.c
@@ -28,9 +28,6 @@
 #include "daemon_debug.h"
 #include "util.h"
 
-
-#define NFSD_VERSION_MISMATCH 116
-
 extern const nfs41_upcall_op nfs41_op_mount;
 extern const nfs41_upcall_op nfs41_op_unmount;
 extern const nfs41_upcall_op nfs41_op_open;
diff --git a/daemon/upcall.h b/daemon/upcall.h
index 009d72c..2b1d4d0 100644
--- a/daemon/upcall.h
+++ b/daemon/upcall.h
@@ -27,6 +27,8 @@
 #include "nfs41_ops.h"
 #include "from_kernel.h"
 
+#define NFSD_VERSION_MISMATCH 116
+
 /* structures for upcall arguments */
 typedef struct __mount_upcall_args {
     const char *hostname;