From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 3 Sep 2011 03:51:59 +0000 (-0400)
Subject: Windows: remove MULTIHOMED ifdef
X-Git-Tag: upstream/1.6.1.pre1^2~123
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d979ea950c4c042772e90166bca6233179d647e9;p=packages%2Fo%2Fopenafs.git

Windows: remove MULTIHOMED ifdef

All builds include the MULTIHOMED functionality.
Get rid of the #ifdef MULTIHOMED.

Reviewed-on: http://gerrit.openafs.org/5333
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit 2271d481d33b2b2ad56dcd4fc9fbdd726fc1967b)

Change-Id: Ia11e4bfdc83737720e5274bad3d01232f0f2dbbe
Reviewed-on: http://gerrit.openafs.org/6023
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---

diff --git a/src/WINNT/afsd/cm_volume.c b/src/WINNT/afsd/cm_volume.c
index f6e2c1daa..e6e0e79f2 100644
--- a/src/WINNT/afsd/cm_volume.c
+++ b/src/WINNT/afsd/cm_volume.c
@@ -161,15 +161,11 @@ cm_VolNameIsID(char *aname)
  *    first, and fall back to successively older versions if you get
  *    RXGEN_OPCODE.
  */
-#define MULTIHOMED 1
-
 static long
 cm_GetEntryByName( struct cm_cell *cellp, const char *name,
                    struct vldbentry *vldbEntryp,
                    struct nvldbentry *nvldbEntryp,
-#ifdef MULTIHOMED
                    struct uvldbentry *uvldbEntryp,
-#endif
                    int *methodp,
                    cm_user_t *userp,
                    cm_req_t *reqp
@@ -189,11 +185,9 @@ cm_GetEntryByName( struct cm_cell *cellp, const char *name,
             continue;
 
         rxconnp = cm_GetRxConn(connp);
-#ifdef MULTIHOMED
         code = VL_GetEntryByNameU(rxconnp, name, uvldbEntryp);
         *methodp = 2;
         if ( code == RXGEN_OPCODE )
-#endif
         {
             code = VL_GetEntryByNameN(rxconnp, name, nvldbEntryp);
             *methodp = 1;
@@ -220,9 +214,7 @@ static long
 cm_GetEntryByID( struct cm_cell *cellp, afs_uint32 id,
                  struct vldbentry *vldbEntryp,
                  struct nvldbentry *nvldbEntryp,
-#ifdef MULTIHOMED
                  struct uvldbentry *uvldbEntryp,
-#endif
                  int *methodp,
                  cm_user_t *userp,
                  cm_req_t *reqp
@@ -249,9 +241,7 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
     u_long tempAddr;
     struct vldbentry vldbEntry;
     struct nvldbentry nvldbEntry;
-#ifdef MULTIHOMED
     struct uvldbentry uvldbEntry;
-#endif
     int method = -1;
     int ROcount = 0;
     long code;
@@ -313,9 +303,7 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
 
         /* now we have volume structure locked and held; make RPC to fill it */
         code = cm_GetEntryByName(cellp, volp->namep, &vldbEntry, &nvldbEntry,
-#ifdef MULTIHOMED
                                  &uvldbEntry,
-#endif
                                  &method, userp, reqp);
     }
 
@@ -334,9 +322,7 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
 
         /* now we have volume structure locked and held; make RPC to fill it */
         code = cm_GetEntryByName(cellp, name, &vldbEntry, &nvldbEntry,
-#ifdef MULTIHOMED
                                  &uvldbEntry,
-#endif
                                  &method, userp, reqp);
     }
 
@@ -348,15 +334,11 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
     if (code == CM_ERROR_NOSUCHVOLUME) {
         if (volp->vol[RWVOL].ID != 0) {
             code = cm_GetEntryByID(cellp, volp->vol[RWVOL].ID, &vldbEntry, &nvldbEntry,
-#ifdef MULTIHOMED
                                     &uvldbEntry,
-#endif
                                     &method, userp, reqp);
         } else if (volp->vol[ROVOL].ID != 0) {
             code = cm_GetEntryByID(cellp, volp->vol[ROVOL].ID, &vldbEntry, &nvldbEntry,
-#ifdef MULTIHOMED
                                     &uvldbEntry,
-#endif
                                     &method, userp, reqp);
         }
     }
@@ -416,7 +398,6 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
             strncpy(name, nvldbEntry.name, VL_MAXNAMELEN);
             name[VL_MAXNAMELEN - 1] = '\0';
             break;
-#ifdef MULTIHOMED
         case 2:
             flags = uvldbEntry.flags;
             nServers = uvldbEntry.nServers;
@@ -475,7 +456,6 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
             strncpy(name, uvldbEntry.name, VL_MAXNAMELEN);
             name[VL_MAXNAMELEN - 1] = '\0';
             break;
-#endif
         }
 
         /* decode the response */
@@ -555,7 +535,6 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
             tempAddr = htonl(serverNumber[i]);
             tsockAddr.sin_addr.s_addr = tempAddr;
             tsp = cm_FindServer(&tsockAddr, CM_SERVER_FILE, FALSE);
-#ifdef MULTIHOMED
             if (tsp && (method == 2) && (tsp->flags & CM_SERVERFLAG_UUID)) {
                 /*
                  * Check to see if the uuid of the server we know at this address
@@ -576,7 +555,6 @@ long cm_UpdateVolumeLocation(struct cm_cell *cellp, cm_user_t *userp, cm_req_t *
                               osi_LogSaveString(afsd_logp, hoststr));
                 }
             }
-#endif
             if (!tsp) {
                 /*
                  * cm_NewServer will probe the file server which in turn will