summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-11-02 15:27:49 +0000
committerDavid Howells <dhowells@redhat.com>2017-11-13 15:38:18 +0000
commitd0676a16781d0972969dff8b3f3f819599cc4b07 (patch)
tree0ccc593980a8947c68b5f21f49b287920bebc7ba
parent03dc2cfca536df89f4b1747caad9324c9be482fa (diff)
downloadop-kernel-dev-d0676a16781d0972969dff8b3f3f819599cc4b07.zip
op-kernel-dev-d0676a16781d0972969dff8b3f3f819599cc4b07.tar.gz
afs: Rename struct afs_call server member to cm_server
Rename the server member of struct afs_call to cm_server as we're only going to be using it for incoming calls for the Cache Manager service. This makes it easier to differentiate from the pointer to the target server for the client, which will point to a different structure to allow for callback handling. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--fs/afs/cmservice.c18
-rw-r--r--fs/afs/internal.h2
-rw-r--r--fs/afs/rxrpc.c1
3 files changed, 10 insertions, 11 deletions
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 03c0a85..91e9215 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -144,12 +144,10 @@ static void afs_cm_destructor(struct afs_call *call)
* afs_deliver_cb_callback().
*/
if (call->unmarshall == 5) {
- ASSERT(call->server && call->count && call->request);
- afs_break_callbacks(call->server, call->count, call->request);
+ ASSERT(call->cm_server && call->count && call->request);
+ afs_break_callbacks(call->cm_server, call->count, call->request);
}
- afs_put_server(call->net, call->server);
- call->server = NULL;
kfree(call->buffer);
call->buffer = NULL;
}
@@ -170,7 +168,7 @@ static void SRXAFSCB_CallBack(struct work_struct *work)
* yet */
afs_send_empty_reply(call);
- afs_break_callbacks(call->server, call->count, call->request);
+ afs_break_callbacks(call->cm_server, call->count, call->request);
afs_put_call(call);
_leave("");
}
@@ -290,7 +288,7 @@ static int afs_deliver_cb_callback(struct afs_call *call)
server = afs_find_server(call->net, &srx);
if (!server)
return -ENOTCONN;
- call->server = server;
+ call->cm_server = server;
return afs_queue_call_work(call);
}
@@ -302,9 +300,9 @@ static void SRXAFSCB_InitCallBackState(struct work_struct *work)
{
struct afs_call *call = container_of(work, struct afs_call, work);
- _enter("{%p}", call->server);
+ _enter("{%p}", call->cm_server);
- afs_init_callback_state(call->server);
+ afs_init_callback_state(call->cm_server);
afs_send_empty_reply(call);
afs_put_call(call);
_leave("");
@@ -335,7 +333,7 @@ static int afs_deliver_cb_init_call_back_state(struct afs_call *call)
server = afs_find_server(call->net, &srx);
if (!server)
return -ENOTCONN;
- call->server = server;
+ call->cm_server = server;
return afs_queue_call_work(call);
}
@@ -407,7 +405,7 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *call)
server = afs_find_server(call->net, &srx);
if (!server)
return -ENOTCONN;
- call->server = server;
+ call->cm_server = server;
return afs_queue_call_work(call);
}
diff --git a/fs/afs/internal.h b/fs/afs/internal.h
index 94b676c..6fa81e0 100644
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@ -76,7 +76,7 @@ struct afs_call {
struct rxrpc_call *rxcall; /* RxRPC call handle */
struct key *key; /* security for this call */
struct afs_net *net; /* The network namespace */
- struct afs_server *server; /* server affected by incoming CM call */
+ struct afs_server *cm_server; /* Server affected by incoming CM call */
void *request; /* request data (first part) */
struct address_space *mapping; /* page set */
struct afs_writeback *wb; /* writeback being performed */
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index d57f09b..ac1e25f 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -161,6 +161,7 @@ void afs_put_call(struct afs_call *call)
if (call->type->destructor)
call->type->destructor(call);
+ afs_put_server(call->net, call->cm_server);
kfree(call->request);
kfree(call);
OpenPOWER on IntegriCloud