Branch b1_8

 b=21513
 i=alexey.lyashkov
 i=johann
----------------------------------------------------------------------
 Modified Files:
  Tag: b1_8
 	lustre/ChangeLog lustre/ptlrpc/import.c
----------------------------------------------------------------------
Description: Clear imp_force_reconnect correctly in ptlrpc_connect_interpret()

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 62743cc..94f5983 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -11,6 +11,10 @@ tbd Sun Microsystems, Inc.
        * Recommended e2fsprogs version: 1.41.6.sun1
 
 Severity   : normal
+Bugzilla   : 21513
+Description: Clear imp_force_reconnect correctly in ptlrpc_connect_interpret()
+
+Severity   : normal
 Bugzilla   : 21259
 Description: Allow non-root access for "lfs check".
 Details    : Added a check in obd_class_ioctl() for OBD_IOC_PING_TARGET.

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index d3b6a87..2496eb4 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -786,8 +786,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
         if (rc) {
                 /* if this reconnect to busy export - not need select new target
                  * for connecting*/
-                if (ptlrpc_busy_reconnect(rc))
-                        imp->imp_force_reconnect = 1;
+                imp->imp_force_reconnect = ptlrpc_busy_reconnect(rc);
                 spin_unlock(&imp->imp_lock);
                 GOTO(out, rc);
         }