summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-05-12 00:21:35 +0200
committerDavid Howells <dhowells@redhat.com>2018-05-14 16:15:18 +0200
commit001ab5a67ee5d191c64aebf4b4ef8c7a0dcfd2bc (patch)
treedffcddcb639f543b2430bac3566d5a9a170d7f7b /fs
parentafs: Fix VNOVOL handling in address rotation (diff)
downloadlinux-001ab5a67ee5d191c64aebf4b4ef8c7a0dcfd2bc.tar.xz
linux-001ab5a67ee5d191c64aebf4b4ef8c7a0dcfd2bc.zip
afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID
Fix the handling of the CB.InitCallBackState3 service call to find the record of a server that we're using by looking it up by the UUID passed as the parameter rather than by its address (of which it might have many, and which may change). Fixes: c35eccb1f614 ("[AFS]: Implement the CB.InitCallBackState3 operation.") Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/afs/cmservice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 357de908df3a..bcd13397bd59 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -341,7 +341,6 @@ static int afs_deliver_cb_init_call_back_state(struct afs_call *call)
*/
static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
{
- struct sockaddr_rxrpc srx;
struct afs_server *server;
struct afs_uuid *r;
unsigned loop;
@@ -398,8 +397,9 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
/* we'll need the file server record as that tells us which set of
* vnodes to operate upon */
- rxrpc_kernel_get_peer(call->net->socket, call->rxcall, &srx);
- server = afs_find_server(call->net, &srx);
+ rcu_read_lock();
+ server = afs_find_server_by_uuid(call->net, call->request);
+ rcu_read_unlock();
if (!server)
return -ENOTCONN;
call->cm_server = server;