aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/afs/afs_cm.h2
-rw-r--r--fs/afs/cmservice.c26
2 files changed, 14 insertions, 14 deletions
diff --git a/fs/afs/afs_cm.h b/fs/afs/afs_cm.h
index 7b4d4fab4c80..5f62f3ea563e 100644
--- a/fs/afs/afs_cm.h
+++ b/fs/afs/afs_cm.h
@@ -24,7 +24,7 @@ enum AFS_CM_Operations {
24 CBGetXStatsVersion = 209, /* get version of extended statistics */ 24 CBGetXStatsVersion = 209, /* get version of extended statistics */
25 CBGetXStats = 210, /* get contents of extended statistics data */ 25 CBGetXStats = 210, /* get contents of extended statistics data */
26 CBInitCallBackState3 = 213, /* initialise callback state, version 3 */ 26 CBInitCallBackState3 = 213, /* initialise callback state, version 3 */
27 CBGetCapabilities = 65538, /* get client capabilities */ 27 CBTellMeAboutYourself = 65538, /* get client capabilities */
28}; 28};
29 29
30#define AFS_CAP_ERROR_TRANSLATION 0x1 30#define AFS_CAP_ERROR_TRANSLATION 0x1
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c
index 47b71c8947f9..75da3d04612c 100644
--- a/fs/afs/cmservice.c
+++ b/fs/afs/cmservice.c
@@ -26,8 +26,8 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *,
26 struct sk_buff *, bool); 26 struct sk_buff *, bool);
27static int afs_deliver_cb_probe(struct afs_call *, struct sk_buff *, bool); 27static int afs_deliver_cb_probe(struct afs_call *, struct sk_buff *, bool);
28static int afs_deliver_cb_callback(struct afs_call *, struct sk_buff *, bool); 28static int afs_deliver_cb_callback(struct afs_call *, struct sk_buff *, bool);
29static int afs_deliver_cb_get_capabilities(struct afs_call *, struct sk_buff *, 29static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *,
30 bool); 30 struct sk_buff *, bool);
31static void afs_cm_destructor(struct afs_call *); 31static void afs_cm_destructor(struct afs_call *);
32 32
33/* 33/*
@@ -71,11 +71,11 @@ static const struct afs_call_type afs_SRXCBProbe = {
71}; 71};
72 72
73/* 73/*
74 * CB.GetCapabilities operation type 74 * CB.TellMeAboutYourself operation type
75 */ 75 */
76static const struct afs_call_type afs_SRXCBGetCapabilites = { 76static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {
77 .name = "CB.GetCapabilities", 77 .name = "CB.TellMeAboutYourself",
78 .deliver = afs_deliver_cb_get_capabilities, 78 .deliver = afs_deliver_cb_tell_me_about_yourself,
79 .abort_to_error = afs_abort_to_error, 79 .abort_to_error = afs_abort_to_error,
80 .destructor = afs_cm_destructor, 80 .destructor = afs_cm_destructor,
81}; 81};
@@ -103,8 +103,8 @@ bool afs_cm_incoming_call(struct afs_call *call)
103 case CBProbe: 103 case CBProbe:
104 call->type = &afs_SRXCBProbe; 104 call->type = &afs_SRXCBProbe;
105 return true; 105 return true;
106 case CBGetCapabilities: 106 case CBTellMeAboutYourself:
107 call->type = &afs_SRXCBGetCapabilites; 107 call->type = &afs_SRXCBTellMeAboutYourself;
108 return true; 108 return true;
109 default: 109 default:
110 return false; 110 return false;
@@ -395,7 +395,7 @@ static int afs_deliver_cb_probe(struct afs_call *call, struct sk_buff *skb,
395/* 395/*
396 * allow the fileserver to ask about the cache manager's capabilities 396 * allow the fileserver to ask about the cache manager's capabilities
397 */ 397 */
398static void SRXAFSCB_GetCapabilities(struct work_struct *work) 398static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work)
399{ 399{
400 struct afs_interface *ifs; 400 struct afs_interface *ifs;
401 struct afs_call *call = container_of(work, struct afs_call, work); 401 struct afs_call *call = container_of(work, struct afs_call, work);
@@ -456,10 +456,10 @@ static void SRXAFSCB_GetCapabilities(struct work_struct *work)
456} 456}
457 457
458/* 458/*
459 * deliver request data to a CB.GetCapabilities call 459 * deliver request data to a CB.TellMeAboutYourself call
460 */ 460 */
461static int afs_deliver_cb_get_capabilities(struct afs_call *call, 461static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *call,
462 struct sk_buff *skb, bool last) 462 struct sk_buff *skb, bool last)
463{ 463{
464 _enter(",{%u},%d", skb->len, last); 464 _enter(",{%u},%d", skb->len, last);
465 465
@@ -471,7 +471,7 @@ static int afs_deliver_cb_get_capabilities(struct afs_call *call,
471 /* no unmarshalling required */ 471 /* no unmarshalling required */
472 call->state = AFS_CALL_REPLYING; 472 call->state = AFS_CALL_REPLYING;
473 473
474 INIT_WORK(&call->work, SRXAFSCB_GetCapabilities); 474 INIT_WORK(&call->work, SRXAFSCB_TellMeAboutYourself);
475 schedule_work(&call->work); 475 schedule_work(&call->work);
476 return 0; 476 return 0;
477} 477}