diff options
| author |   David Howells <dhowells@redhat.com> | 2017-10-18 11:36:39 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-10-18 11:37:20 +0100 |
| commit | a68f4a27f55f1d54e35c270aff89383da4b1b656 (patch) | |
| tree | 72d70f77bee499627425bfaf8df64693320dbc67 /net/rxrpc/recvmsg.c | |
| parent | net: export netdev_txq_to_tc to allow sch_mqprio to compile as module (diff) | |
| download | linux-dev-a68f4a27f55f1d54e35c270aff89383da4b1b656.tar.xz linux-dev-a68f4a27f55f1d54e35c270aff89383da4b1b656.zip | |
rxrpc: Support service upgrade from a kernel service
Provide support for a kernel service to make use of the service upgrade
facility. This involves:
(1) Pass an upgrade request flag to rxrpc_kernel_begin_call().
(2) Make rxrpc_kernel_recv_data() return the call's current service ID so
that the caller can detect service upgrade and see what the service
was upgraded to.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/recvmsg.c')
| -rw-r--r-- | net/rxrpc/recvmsg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index bdece21f313d..e4937b3f3685 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -607,6 +607,7 @@ wait_error: * @_offset: The running offset into the buffer. * @want_more: True if more data is expected to be read * @_abort: Where the abort code is stored if -ECONNABORTED is returned + * @_service: Where to store the actual service ID (may be upgraded) * * Allow a kernel service to receive data and pick up information about the * state of a call. Returns 0 if got what was asked for and there's more @@ -624,7 +625,7 @@ wait_error: */ int rxrpc_kernel_recv_data(struct socket *sock, struct rxrpc_call *call, void *buf, size_t size, size_t *_offset, - bool want_more, u32 *_abort) + bool want_more, u32 *_abort, u16 *_service) { struct iov_iter iter; struct kvec iov; @@ -680,6 +681,8 @@ int rxrpc_kernel_recv_data(struct socket *sock, struct rxrpc_call *call, read_phase_complete: ret = 1; out: + if (_service) + *_service = call->service_id; mutex_unlock(&call->user_mutex); _leave(" = %d [%zu,%d]", ret, *_offset, *_abort); return ret; |