Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8fe08be
)
b=2017: remove some outdated asserts and flag-clearing WRT no_resend reqs.
author
shaver
<shaver>
Thu, 25 Sep 2003 16:12:40 +0000
(16:12 +0000)
committer
shaver
<shaver>
Thu, 25 Sep 2003 16:12:40 +0000
(16:12 +0000)
lustre/ptlrpc/client.c
patch
|
blob
|
history
diff --git
a/lustre/ptlrpc/client.c
b/lustre/ptlrpc/client.c
index
725d4a1
..
18a75a5
100644
(file)
--- a/
lustre/ptlrpc/client.c
+++ b/
lustre/ptlrpc/client.c
@@
-1372,12
+1372,8
@@
restart:
/* Resend if we need to, unless we were interrupted. */
if (req->rq_resend && !req->rq_intr) {
/* ...unless we were specifically told otherwise. */
/* Resend if we need to, unless we were interrupted. */
if (req->rq_resend && !req->rq_intr) {
/* ...unless we were specifically told otherwise. */
- if (req->rq_no_resend) {
- spin_lock_irqsave (&req->rq_lock, flags);
- req->rq_no_resend = 0;
- spin_unlock_irqrestore (&req->rq_lock, flags);
+ if (req->rq_no_resend)
GOTO(out, rc = -ETIMEDOUT);
GOTO(out, rc = -ETIMEDOUT);
- }
spin_lock_irqsave (&req->rq_lock, flags);
req->rq_resend = 0;
spin_unlock_irqrestore (&req->rq_lock, flags);
spin_lock_irqsave (&req->rq_lock, flags);
req->rq_resend = 0;
spin_unlock_irqrestore (&req->rq_lock, flags);
@@
-1433,12
+1429,8
@@
restart:
rc = brc;
}
}
rc = brc;
}
}
- if (rc < 0) {
- /* MDS blocks for put ACKs before replying */
- /* OSC sets rq_no_resend for the time being */
- LASSERT(req->rq_no_resend);
+ if (rc < 0)
ptlrpc_unregister_bulk (req);
ptlrpc_unregister_bulk (req);
- }
}
LASSERT(!req->rq_receiving_reply);
}
LASSERT(!req->rq_receiving_reply);