Branch HEAD

 b=21513
 i=alexey.lyashkov
 i=johann
 ----------------------------------------------------------------------
 Modified Files:
 	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 b10ca8b..82fd400 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,6 +14,10 @@ tbd  Sun Microsystems, Inc.
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 
        * RHEL 4 and RHEL 5/SLES 10 clients behaves differently on 'cd' to a
         removed cwd "./" (refer to Bugzilla 14399).
 

+Severity   : normal
+Bugzilla   : 21513
+Description: Clear imp_force_reconnect correctly in ptlrpc_connect_interpret()
+

 Severity   : enhancement
 Bugzilla   : 20773
 Description: Update kernel to RHEL5.4 2.6.18-164.6.1.el5 and
 Severity   : enhancement
 Bugzilla   : 20773
 Description: Update kernel to RHEL5.4 2.6.18-164.6.1.el5 and

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index af8ce40..e6cde5c 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -806,8 +806,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
         if (rc) {
                 /* if this reconnect to busy export - not need select new target
                  * for connecting*/
         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);
         }
                 spin_unlock(&imp->imp_lock);
                 GOTO(out, rc);
         }