Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8645 ptlrpc: update imp_known_replied_xid on resend-replay
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
recover.c
diff --git
a/lustre/ptlrpc/recover.c
b/lustre/ptlrpc/recover.c
index
7d23518
..
02f79d0
100644
(file)
--- 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
*
* 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
*/
*
* 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 &&
/* 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);
ptlrpc_add_unreplied(req);
+ imp->imp_known_replied_xid = ptlrpc_known_replied_xid(imp);
+ }
imp->imp_resend_replay = 0;
spin_unlock(&imp->imp_lock);
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) {
}
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);
"req %p bad\n", req);
LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req);