X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fptlrpc%2Fimport.c;h=96ab1d926417b48e0ace482988697aef33afe288;hp=3458c5b64b88de33544e8f4d83bc973b67dc1f33;hb=94fbe511ba96c0b66770943d3fdb7961183d6436;hpb=ef1783e282f6eba9d69b0957f1b5fed00be0cbd6

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 3458c5b..96ab1d9 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -1748,7 +1748,8 @@ static void ptlrpc_reset_reqs_generation(struct obd_import *imp)
 			rq_list) {
 		spin_lock(&old->rq_lock);
 		if (old->rq_import_generation == imp->imp_generation - 1 &&
-		    !old->rq_no_resend)
+		    ((imp->imp_initiated_at == imp->imp_generation) ||
+		     !old->rq_no_resend))
 			old->rq_import_generation = imp->imp_generation;
 		spin_unlock(&old->rq_lock);
 	}