In the previous commit we've already made a change that

makes this code unnecessary since the node is returned
even if the backing file server is known to be down.
Since the code path is unused it should be removed.
From: Krisztian Kovacs <Kris.Kovacs@morganstanley.com>

diff --git a/ChangeLog b/ChangeLog
index faeb65b679fc23d9ad8616a93e3b6516e7c7d557..00d008c55b747df7e40a8328728c79b9f8458659 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 2009-12-10  Christos Zoulas <christos@zoulas.com>
+
+       * In the previous commit we've already made a change that
+         makes this code unnecessary since the node is returned
+         even if the backing file server is known to be down.
+         Since the code path is unused it should be removed.
+         From: Krisztian Kovacs <Kris.Kovacs@morganstanley.com>
+
        * amfs_generic_lookup_child() tries to find an alternate
          file server if it detects that the current one is down.
          However, in the comparison used to decide if a possible

diff --git a/amd/amfs_generic.c b/amd/amfs_generic.c
index 69991bff884f8c23d9d3aab6d8261c3f3aaf8058..09be7a3fe63c6f0dbedee621c0b74ac0d4d5aac9 100644 (file)
--- a/amd/amfs_generic.c
+++ b/amd/amfs_generic.c
@@ -1193,33 +1193,6 @@ amfs_generic_lookup_child(am_node *mp, char *fname, int *error_return, int op)
     return NULL;
   }
 
-  /*
-   * Already mounted but known to be down:
-   * check if we have any alternatives to mount
-   */
-  if (mp_error == 0) {
-    am_loc **alp;
-    for (alp = al_array; *alp; alp++)
-      if (*alp != new_mp->am_al && (*alp)->al_mnt != new_mp->am_al->al_mnt)
-       break;
-    if (*alp != NULL) {
-      /*
-       * we found an alternative, so try mounting again.
-       */
-      *error_return = -1;
-    } else {
-      for (alp = al_array; *alp; alp++)
-       free_loc(*alp);
-      XFREE(al_array);
-      if (new_mp->am_flags & AMF_SOFTLOOKUP) {
-       ereturn(EIO);
-      } else {
-       *error_return = 0;
-       return new_mp;
-      }
-    }
-  }
-
   /* store the array inside the am_node */
   new_mp->am_alarray = al_array;