Commit 6f2ff7e8 authored by David Howells's avatar David Howells
Browse files

afs: Don't put afs_call in afs_wait_for_call_to_complete() 



Don't put the afs_call struct in afs_wait_for_call_to_complete() but rather
have the caller do it.  This will allow the caller to fish stuff out of the
afs_call struct rather than the afs_addr_cursor struct, thereby allowing a
subsequent patch to subsume it.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent 2de5599f

fs/afs/fs_operation.c

+5 −2
Original line number Diff line number Diff line
@@ -191,8 +191,11 @@ void afs_wait_for_operation(struct afs_operation *op) 
		else

			op->ac.error = -ENOTSUPP;



		if (op->call)

			op->error = afs_wait_for_call_to_complete(op->call, &op->ac);

		if (op->call) {

			afs_wait_for_call_to_complete(op->call, &op->ac);

			op->error = op->ac.error;

			afs_put_call(op->call);

		}

	}



	switch (op->error) {

fs/afs/fsclient.c

+4 −1
Original line number Diff line number Diff line
@@ -1612,6 +1612,7 @@ int afs_fs_give_up_all_callbacks(struct afs_net *net, 
{

	struct afs_call *call;

	__be32 *bp;

	int ret;



	_enter("");
@@ -1627,7 +1628,9 @@ int afs_fs_give_up_all_callbacks(struct afs_net *net, 


	call->server = afs_use_server(server, afs_server_trace_give_up_cb);

	afs_make_call(ac, call, GFP_NOFS);

	return afs_wait_for_call_to_complete(call, ac);

	afs_wait_for_call_to_complete(call, ac);

	afs_put_call(call);

	return ret;

}



/*

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ extern void __net_exit afs_close_socket(struct afs_net *); 
extern void afs_charge_preallocation(struct work_struct *);

extern void afs_put_call(struct afs_call *);

extern void afs_make_call(struct afs_addr_cursor *, struct afs_call *, gfp_t);

extern long afs_wait_for_call_to_complete(struct afs_call *, struct afs_addr_cursor *);

void afs_wait_for_call_to_complete(struct afs_call *call, struct afs_addr_cursor *ac);

extern struct afs_call *afs_alloc_flat_call(struct afs_net *,

					    const struct afs_call_type *,

					    size_t, size_t);

fs/afs/rxrpc.c

+27 −46
Original line number Diff line number Diff line
@@ -575,19 +575,14 @@ static void afs_deliver_to_call(struct afs_call *call) 
/*

 * Wait synchronously for a call to complete and clean up the call struct.

 */

long afs_wait_for_call_to_complete(struct afs_call *call,

				   struct afs_addr_cursor *ac)

void afs_wait_for_call_to_complete(struct afs_call *call, struct afs_addr_cursor *ac)

{

	long ret;

	bool rxrpc_complete = false;



	DECLARE_WAITQUEUE(myself, current);



	_enter("");



	ret = call->error;

	if (ret < 0)

		goto out;

	if (!afs_check_call_state(call, AFS_CALL_COMPLETE)) {

		DECLARE_WAITQUEUE(myself, current);



		add_wait_queue(&call->waitq, &myself);

		for (;;) {
@@ -616,6 +611,7 @@ long afs_wait_for_call_to_complete(struct afs_call *call, 


		remove_wait_queue(&call->waitq, &myself);

		__set_current_state(TASK_RUNNING);

	}



	if (!afs_check_call_state(call, AFS_CALL_COMPLETE)) {

		if (rxrpc_complete) {
@@ -635,23 +631,8 @@ long afs_wait_for_call_to_complete(struct afs_call *call, 
	ac->error = call->error;

	spin_unlock_bh(&call->state_lock);



	ret = ac->error;

	switch (ret) {

	case 0:

		ret = call->ret0;

		call->ret0 = 0;



		fallthrough;

	case -ECONNABORTED:

	if (call->error == 0 || call->error == -ECONNABORTED)

		ac->responded = true;

		break;

	}



out:

	_debug("call complete");

	afs_put_call(call);

	_leave(" = %p", (void *)ret);

	return ret;

}



/*

fs/afs/vlclient.c

+38 −26
Original line number Diff line number Diff line
@@ -106,12 +106,6 @@ static int afs_deliver_vl_get_entry_by_name_u(struct afs_call *call) 
	return 0;

}



static void afs_destroy_vl_get_entry_by_name_u(struct afs_call *call)

{

	kfree(call->ret_vldb);

	afs_flat_call_destructor(call);

}



/*

 * VL.GetEntryByNameU operation type.

 */
@@ -119,7 +113,7 @@ static const struct afs_call_type afs_RXVLGetEntryByNameU = { 
	.name		= "VL.GetEntryByNameU",

	.op		= afs_VL_GetEntryByNameU,

	.deliver	= afs_deliver_vl_get_entry_by_name_u,

	.destructor	= afs_destroy_vl_get_entry_by_name_u,

	.destructor	= afs_flat_call_destructor,

};



/*
@@ -166,7 +160,13 @@ struct afs_vldb_entry *afs_vl_get_entry_by_name_u(struct afs_vl_cursor *vc, 


	trace_afs_make_vl_call(call);

	afs_make_call(&vc->ac, call, GFP_KERNEL);

	return (struct afs_vldb_entry *)afs_wait_for_call_to_complete(call, &vc->ac);

	afs_wait_for_call_to_complete(call, &vc->ac);

	afs_put_call(call);

	if (vc->ac.error) {

		kfree(entry);

		return ERR_PTR(vc->ac.error);

	}

	return entry;

}



/*
@@ -249,12 +249,6 @@ static int afs_deliver_vl_get_addrs_u(struct afs_call *call) 
	return 0;

}



static void afs_vl_get_addrs_u_destructor(struct afs_call *call)

{

	afs_put_addrlist(call->ret_alist);

	return afs_flat_call_destructor(call);

}



/*

 * VL.GetAddrsU operation type.

 */
@@ -262,7 +256,7 @@ static const struct afs_call_type afs_RXVLGetAddrsU = { 
	.name		= "VL.GetAddrsU",

	.op		= afs_VL_GetAddrsU,

	.deliver	= afs_deliver_vl_get_addrs_u,

	.destructor	= afs_vl_get_addrs_u_destructor,

	.destructor	= afs_flat_call_destructor,

};



/*
@@ -273,6 +267,7 @@ struct afs_addr_list *afs_vl_get_addrs_u(struct afs_vl_cursor *vc, 
					 const uuid_t *uuid)

{

	struct afs_ListAddrByAttributes__xdr *r;

	struct afs_addr_list *alist;

	const struct afs_uuid *u = (const struct afs_uuid *)uuid;

	struct afs_call *call;

	struct afs_net *net = vc->cell->net;
@@ -309,7 +304,14 @@ struct afs_addr_list *afs_vl_get_addrs_u(struct afs_vl_cursor *vc, 


	trace_afs_make_vl_call(call);

	afs_make_call(&vc->ac, call, GFP_KERNEL);

	return (struct afs_addr_list *)afs_wait_for_call_to_complete(call, &vc->ac);

	afs_wait_for_call_to_complete(call, &vc->ac);

	alist = call->ret_alist;

	afs_put_call(call);

	if (vc->ac.error) {

		afs_put_addrlist(alist);

		return ERR_PTR(vc->ac.error);

	}

	return alist;

}



/*
@@ -618,7 +620,7 @@ static const struct afs_call_type afs_YFSVLGetEndpoints = { 
	.name		= "YFSVL.GetEndpoints",

	.op		= afs_YFSVL_GetEndpoints,

	.deliver	= afs_deliver_yfsvl_get_endpoints,

	.destructor	= afs_vl_get_addrs_u_destructor,

	.destructor	= afs_flat_call_destructor,

};



/*
@@ -628,6 +630,7 @@ static const struct afs_call_type afs_YFSVLGetEndpoints = { 
struct afs_addr_list *afs_yfsvl_get_endpoints(struct afs_vl_cursor *vc,

					      const uuid_t *uuid)

{

	struct afs_addr_list *alist;

	struct afs_call *call;

	struct afs_net *net = vc->cell->net;

	__be32 *bp;
@@ -652,7 +655,14 @@ struct afs_addr_list *afs_yfsvl_get_endpoints(struct afs_vl_cursor *vc, 


	trace_afs_make_vl_call(call);

	afs_make_call(&vc->ac, call, GFP_KERNEL);

	return (struct afs_addr_list *)afs_wait_for_call_to_complete(call, &vc->ac);

	afs_wait_for_call_to_complete(call, &vc->ac);

	alist = call->ret_alist;

	afs_put_call(call);

	if (vc->ac.error) {

		afs_put_addrlist(alist);

		return ERR_PTR(vc->ac.error);

	}

	return alist;

}



/*
@@ -717,12 +727,6 @@ static int afs_deliver_yfsvl_get_cell_name(struct afs_call *call) 
	return 0;

}



static void afs_destroy_yfsvl_get_cell_name(struct afs_call *call)

{

	kfree(call->ret_str);

	afs_flat_call_destructor(call);

}



/*

 * VL.GetCapabilities operation type

 */
@@ -730,7 +734,7 @@ static const struct afs_call_type afs_YFSVLGetCellName = { 
	.name		= "YFSVL.GetCellName",

	.op		= afs_YFSVL_GetCellName,

	.deliver	= afs_deliver_yfsvl_get_cell_name,

	.destructor	= afs_destroy_yfsvl_get_cell_name,

	.destructor	= afs_flat_call_destructor,

};



/*
@@ -745,6 +749,7 @@ char *afs_yfsvl_get_cell_name(struct afs_vl_cursor *vc) 
	struct afs_call *call;

	struct afs_net *net = vc->cell->net;

	__be32 *bp;

	char *cellname;



	_enter("");
@@ -763,5 +768,12 @@ char *afs_yfsvl_get_cell_name(struct afs_vl_cursor *vc) 
	/* Can't take a ref on server */

	trace_afs_make_vl_call(call);

	afs_make_call(&vc->ac, call, GFP_KERNEL);

	return (char *)afs_wait_for_call_to_complete(call, &vc->ac);

	afs_wait_for_call_to_complete(call, &vc->ac);

	cellname = call->ret_str;

	afs_put_call(call);

	if (vc->ac.error) {

		kfree(cellname);

		return ERR_PTR(vc->ac.error);

	}

	return cellname;

}