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

Commit 33cd7f2b authored by David Howells's avatar David Howells
Browse files

afs: Potentially return call->reply[0] from afs_make_call() 



If call->ret_reply0 is set, return call->reply[0] on success.  Change the
return type of afs_make_call() to long so that this can be passed back
without bit loss and then cast to a pointer if required.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 97e3043a

fs/afs/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct afs_call { 
	bool			send_pages;	/* T if data from mapping should be sent */

	bool			need_attention;	/* T if RxRPC poked us */

	bool			async;		/* T if asynchronous */

	bool			ret_reply0;	/* T if should return reply[0] on success */

	bool			upgrade;	/* T to request service upgrade */

	u16			service_id;	/* RxRPC service ID to call */

	u32			operation_ID;	/* operation ID for an incoming call */
@@ -647,7 +648,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 int afs_queue_call_work(struct afs_call *);

extern int afs_make_call(struct sockaddr_rxrpc *, struct afs_call *, gfp_t, bool);

extern long afs_make_call(struct sockaddr_rxrpc *, struct afs_call *, gfp_t, bool);

extern struct afs_call *afs_alloc_flat_call(struct afs_net *,

					    const struct afs_call_type *,

					    size_t, size_t);

fs/afs/rxrpc.c

+16 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
struct workqueue_struct *afs_async_calls;



static void afs_wake_up_call_waiter(struct sock *, struct rxrpc_call *, unsigned long);

static int afs_wait_for_call_to_complete(struct afs_call *);

static long afs_wait_for_call_to_complete(struct afs_call *);

static void afs_wake_up_async_call(struct sock *, struct rxrpc_call *, unsigned long);

static void afs_process_async_call(struct work_struct *);

static void afs_rx_new_call(struct sock *, struct rxrpc_call *, unsigned long);
@@ -320,7 +320,7 @@ static int afs_send_pages(struct afs_call *call, struct msghdr *msg) 
/*

 * initiate a call

 */

int afs_make_call(struct sockaddr_rxrpc *srx, struct afs_call *call,

long afs_make_call(struct sockaddr_rxrpc *srx, struct afs_call *call,

		   gfp_t gfp, bool async)

{

	struct rxrpc_call *rxcall;
@@ -415,9 +415,9 @@ int afs_make_call(struct sockaddr_rxrpc *srx, struct afs_call *call, 
		abort_code = 0;

		offset = 0;

		rxrpc_kernel_recv_data(call->net->socket, rxcall, NULL,

				       0, &offset, false, &abort_code,

				       0, &offset, false, &call->abort_code,

				       &call->service_id);

		ret = afs_abort_to_error(abort_code);

		ret = afs_abort_to_error(call->abort_code);

	}

error_kill_call:

	afs_put_call(call);
@@ -468,7 +468,7 @@ static void afs_deliver_to_call(struct afs_call *call) 
		case -EAGAIN:

			goto out;

		case -ECONNABORTED:

			goto call_complete;

			goto save_error;

		case -ENOTCONN:

			abort_code = RX_CALL_DEAD;

			rxrpc_kernel_abort_call(call->net->socket, call->rxcall,
@@ -501,7 +501,6 @@ static void afs_deliver_to_call(struct afs_call *call) 


save_error:

	call->error = ret;

call_complete:

	call->state = AFS_CALL_COMPLETE;

	goto done;

}
@@ -509,10 +508,10 @@ static void afs_deliver_to_call(struct afs_call *call) 
/*

 * wait synchronously for a call to complete

 */

static int afs_wait_for_call_to_complete(struct afs_call *call)

static long afs_wait_for_call_to_complete(struct afs_call *call)

{

	signed long rtt2, timeout;

	int ret;

	long ret;

	u64 rtt;

	u32 life, last_life;
@@ -567,9 +566,16 @@ static int afs_wait_for_call_to_complete(struct afs_call *call) 
	}



	ret = call->error;

	if (ret < 0) {

		ret = afs_abort_to_error(call->abort_code);

	} else if (ret == 0 && call->ret_reply0) {

		ret = (long)call->reply[0];

		call->reply[0] = NULL;

	}



	_debug("call complete");

	afs_put_call(call);

	_leave(" = %d", ret);

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

	return ret;

}