Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c80bcce authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

afs: the AFS RPC op CBGetCapabilities is actually CBTellMeAboutYourself 



The AFS RxRPC op CBGetCapabilities is actually CBTellMeAboutYourself.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ae52d6f

fs/afs/afs_cm.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ enum AFS_CM_Operations { 
	CBGetXStatsVersion	= 209,	/* get version of extended statistics */

	CBGetXStats		= 210,	/* get contents of extended statistics data */

	CBInitCallBackState3	= 213,	/* initialise callback state, version 3 */

	CBGetCapabilities	= 65538, /* get client capabilities */

	CBTellMeAboutYourself	= 65538, /* get client capabilities */

};



#define AFS_CAP_ERROR_TRANSLATION	0x1

fs/afs/cmservice.c

+13 −13
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ static int afs_deliver_cb_init_call_back_state3(struct afs_call *, 
						struct sk_buff *, bool);

static int afs_deliver_cb_probe(struct afs_call *, struct sk_buff *, bool);

static int afs_deliver_cb_callback(struct afs_call *, struct sk_buff *, bool);

static int afs_deliver_cb_get_capabilities(struct afs_call *, struct sk_buff *,

					   bool);

static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *,

						 struct sk_buff *, bool);

static void afs_cm_destructor(struct afs_call *);



/*
@@ -71,11 +71,11 @@ static const struct afs_call_type afs_SRXCBProbe = { 
};



/*

 * CB.GetCapabilities operation type

 * CB.TellMeAboutYourself operation type

 */

static const struct afs_call_type afs_SRXCBGetCapabilites = {

	.name		= "CB.GetCapabilities",

	.deliver	= afs_deliver_cb_get_capabilities,

static const struct afs_call_type afs_SRXCBTellMeAboutYourself = {

	.name		= "CB.TellMeAboutYourself",

	.deliver	= afs_deliver_cb_tell_me_about_yourself,

	.abort_to_error	= afs_abort_to_error,

	.destructor	= afs_cm_destructor,

};
@@ -103,8 +103,8 @@ bool afs_cm_incoming_call(struct afs_call *call) 
	case CBProbe:

		call->type = &afs_SRXCBProbe;

		return true;

	case CBGetCapabilities:

		call->type = &afs_SRXCBGetCapabilites;

	case CBTellMeAboutYourself:

		call->type = &afs_SRXCBTellMeAboutYourself;

		return true;

	default:

		return false;
@@ -395,7 +395,7 @@ static int afs_deliver_cb_probe(struct afs_call *call, struct sk_buff *skb, 
/*

 * allow the fileserver to ask about the cache manager's capabilities

 */

static void SRXAFSCB_GetCapabilities(struct work_struct *work)

static void SRXAFSCB_TellMeAboutYourself(struct work_struct *work)

{

	struct afs_interface *ifs;

	struct afs_call *call = container_of(work, struct afs_call, work);
@@ -456,9 +456,9 @@ static void SRXAFSCB_GetCapabilities(struct work_struct *work) 
}



/*

 * deliver request data to a CB.GetCapabilities call

 * deliver request data to a CB.TellMeAboutYourself call

 */

static int afs_deliver_cb_get_capabilities(struct afs_call *call,

static int afs_deliver_cb_tell_me_about_yourself(struct afs_call *call,

						 struct sk_buff *skb, bool last)

{

	_enter(",{%u},%d", skb->len, last);
@@ -471,7 +471,7 @@ static int afs_deliver_cb_get_capabilities(struct afs_call *call, 
	/* no unmarshalling required */

	call->state = AFS_CALL_REPLYING;



	INIT_WORK(&call->work, SRXAFSCB_GetCapabilities);

	INIT_WORK(&call->work, SRXAFSCB_TellMeAboutYourself);

	schedule_work(&call->work);

	return 0;

}