diff options
author | David S. Miller <davem@davemloft.net> | 2016-10-06 21:04:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-10-06 21:04:24 -0400 |
commit | 0d818c288974e6f80923775dbf6225e3cb66659c (patch) | |
tree | 36286f4b31386698e72035d7a049a65238e32b75 /fs | |
parent | 4af1474e6198b10fee7bb20e81f7e033ad1b586c (diff) | |
parent | bf7d620abf22c321208a4da4f435e7af52551a21 (diff) | |
download | linux-stable-0d818c288974e6f80923775dbf6225e3cb66659c.tar.gz linux-stable-0d818c288974e6f80923775dbf6225e3cb66659c.tar.bz2 linux-stable-0d818c288974e6f80923775dbf6225e3cb66659c.zip |
Merge tag 'rxrpc-rewrite-20161004' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
David Howells says:
====================
rxrpc: Fixes
This set of patches contains a bunch of fixes:
(1) Fix an oops on incoming call to a local endpoint without a bound
service.
(2) Only ping for a lost reply in a client call (this is inapplicable to
service calls).
(3) Fix maybe uninitialised variable warnings in the ACK/ABORT sending
function by splitting it.
(4) Fix loss of PING RESPONSE ACKs due to them being subsumed by PING ACK
generation.
(5) OpenAFS improperly terminates calls it makes as a client under some
circumstances by not fully hard-ACK'ing the last DATA packets. This
is alleviated by a new call appearing on the same channel implicitly
completing the previous call on that channel. Handle this implicit
completion.
(6) Properly handle expiry of service calls due to the aforementioned
improper termination with no follow up call to implicitly complete it:
(a) The call's background processor needs to be queued to complete the
call, send an abort and notify the socket.
(b) The call's background processor needs to notify the socket (or the
kernel service) when it has completed the call.
(c) A negative error code must thence be returned to the kernel
service so that it knows the call died.
(d) The AFS filesystem must detect the fatal error and end the call.
(7) Must produce a DELAY ACK when the actual service operation takes a
while to process and must cancel the ACK when the reply is ready.
(8) Don't request an ACK on the last DATA packet of the Tx phase as this
confuses OpenAFS.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/afs/rxrpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 59bdaa7527b6..477928b25940 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -418,7 +418,7 @@ static void afs_deliver_to_call(struct afs_call *call) &call->abort_code); if (ret == -EINPROGRESS || ret == -EAGAIN) return; - if (ret == 1) { + if (ret == 1 || ret < 0) { call->state = AFS_CALL_COMPLETE; goto done; } |