afs: Drop GLOCK for RXAFS_GetCapabilities

[openafs.git] / src / afs / afs_server.c

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index f49bda2..22d9bfd 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -1354,7 +1354,7 @@ afs_SetServerPrefs(struct srvAddr *const sa)
            TAILQ_FOREACH(ifa, &ifn->if_addrhead, ifa_link) {
                afsi_SetServerIPRank(sa, ifa);
     }}}
-#elif defined(AFS_FBSD80_ENV)
+#elif defined(AFS_FBSD_ENV)
     {
        struct in_ifaddr *ifa;
        CURVNET_SET(rx_socket->so_vnet);
@@ -1363,13 +1363,6 @@ afs_SetServerPrefs(struct srvAddr *const sa)
        }
        CURVNET_RESTORE();
     }
-#elif defined(AFS_FBSD_ENV)
-    {
-       struct in_ifaddr *ifa;
-       TAILQ_FOREACH(ifa, &in_ifaddrhead, ia_link) {
-           afsi_SetServerIPRank(sa, &ifa->ia_ifa);
-       }
-    }
 #elif defined(AFS_OBSD_ENV)
     {
        extern struct in_ifaddrhead in_ifaddr;
@@ -1527,7 +1520,9 @@ afs_GetCapabilities(struct server *ts)
     }
     /* InitCallBackStateN, triggered by our RPC, may need this */
     ReleaseWriteLock(&afs_xserver);
+    AFS_GUNLOCK();
     code = RXAFS_GetCapabilities(rxconn, &caps);
+    AFS_GLOCK();
     ObtainWriteLock(&afs_xserver, 723);
     /* we forced a conn above; important we mark it down if needed */
     if ((code < 0) && (code != RXGEN_OPCODE)) {