X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fobd_mount_server.c;h=3f621dc9c04a801fb0b105006e394b34fe323545;hb=f0d5693584bc70913541201c54c3666a473715b2;hp=8b5bf9199370f92a5ba7f9ab7fbd879e33a47b72;hpb=b0d1be42118274d608ed171855de9c00a30c0d22;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index 8b5bf91..3f621dc 100644
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -1904,23 +1904,20 @@ void server_calc_timeout(struct lustre_sb_info *lsi, struct obd_device *obd)
 
 	if (has_ir) {
 		int new_soft = soft;
-		int new_hard = hard;
 
 		/* adjust timeout value by imperative recovery */
-
 		new_soft = (soft * factor) / OBD_IR_FACTOR_MAX;
-		new_hard = (hard * factor) / OBD_IR_FACTOR_MAX;
-
 		/* make sure the timeout is not too short */
 		new_soft = max(min, new_soft);
-		new_hard = max(new_soft, new_hard);
 
 		LCONSOLE_INFO("%s: Imperative Recovery enabled, recovery "
 			      "window shrunk from %d-%d down to %d-%d\n",
-			      obd->obd_name, soft, hard, new_soft, new_hard);
+			      obd->obd_name, soft, hard, new_soft, hard);
 
 		soft = new_soft;
-		hard = new_hard;
+	} else {
+		LCONSOLE_INFO("%s: Imperative Recovery not enabled, recovery "
+			      "window %d-%d\n", obd->obd_name, soft, hard);
 	}
 
 	/* we're done */