X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Fptlrpc%2Frecover.c;h=02f79d08e306d6f3d1a32e400527c63e76840942;hb=51f1b46dab6c2cc16f71d3f3be483f530b5e4001;hp=7d23518b8182ed25a513fef439958ece5c412e57;hpb=91ef75669c7e41091378a8401ca0c093b7f17174;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index 7d23518..02f79d0 100644
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -167,8 +163,10 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
 	/* The resend replay request may have been removed from the
 	 * unreplied list. */
 	if (req != NULL && imp->imp_resend_replay &&
-	    list_empty(&req->rq_unreplied_list))
+	    list_empty(&req->rq_unreplied_list)) {
 		ptlrpc_add_unreplied(req);
+		imp->imp_known_replied_xid = ptlrpc_known_replied_xid(imp);
+	}
 
 	imp->imp_resend_replay = 0;
 	spin_unlock(&imp->imp_lock);
@@ -212,7 +210,7 @@ int ptlrpc_resend(struct obd_import *imp)
         }
 
 	list_for_each_entry_safe(req, next, &imp->imp_sending_list, rq_list) {
-		LASSERTF((long)req > PAGE_CACHE_SIZE && req != LP_POISON,
+		LASSERTF((long)req > PAGE_SIZE && req != LP_POISON,
 			 "req %p bad\n", req);
 		LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req);