xnu-4570.71.2.tar.gz

[apple/xnu.git] / bsd / nfs / nfs_lock.c

diff --git a/bsd/nfs/nfs_lock.c b/bsd/nfs/nfs_lock.c
index 981779afaf72acc6e0c091229162adcac1aa0378..9920f3c89ff6cf5e34d00219e79fcd824ac139b1 100644 (file)
--- a/bsd/nfs/nfs_lock.c
+++ b/bsd/nfs/nfs_lock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002-2014 Apple Inc. All rights reserved.
+ * Copyright (c) 2002-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -399,9 +399,7 @@ nfs_lockd_send_request(LOCKD_MSG *msg, int interruptable)
                 */
                return (EAGAIN);
        }
-       return (kr);
 }
-                               
 
 /*
  * NFS advisory byte-level locks (client)
@@ -609,7 +607,7 @@ wait_for_granted:
                            ((lastmsg + nmp->nm_tprintf_delay) < now.tv_sec)) {
                                lck_mtx_unlock(&nmp->nm_lock);
                                lastmsg = now.tv_sec;
-                               nfs_down(nmp, thd, 0, NFSSTA_LOCKTIMEO, "lockd not responding", 0);
+                               nfs_down(nmp, thd, 0, NFSSTA_LOCKTIMEO, "lockd not responding", 1);
                                wentdown = 1;
                        } else
                                lck_mtx_unlock(&nmp->nm_lock);