OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells 2017-11-02 15:27:48 +00:00
parent 97e3043ad8
commit 33cd7f2b76
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/afs/internal.h
View File

@ -101,6 +101,7 @@ struct afs_call {
bool send_pages; /* T if data from mapping should be sent */ bool send_pages; /* T if data from mapping should be sent */
bool need_attention; /* T if RxRPC poked us */ bool need_attention; /* T if RxRPC poked us */
bool async; /* T if asynchronous */ bool async; /* T if asynchronous */
bool ret_reply0; /* T if should return reply[0] on success */
bool upgrade; /* T to request service upgrade */ bool upgrade; /* T to request service upgrade */
u16 service_id; /* RxRPC service ID to call */ u16 service_id; /* RxRPC service ID to call */
u32 operation_ID; /* operation ID for an incoming 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_charge_preallocation(struct work_struct *);
extern void afs_put_call(struct afs_call *); extern void afs_put_call(struct afs_call *);
extern int afs_queue_call_work(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 *, extern struct afs_call *afs_alloc_flat_call(struct afs_net *,
const struct afs_call_type *, const struct afs_call_type *,
size_t, size_t); size_t, size_t);

26
fs/afs/rxrpc.c
View File

@ -20,7 +20,7 @@
struct workqueue_struct *afs_async_calls; struct workqueue_struct *afs_async_calls;
static void afs_wake_up_call_waiter(struct sock *, struct rxrpc_call *, unsigned long); 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_wake_up_async_call(struct sock *, struct rxrpc_call *, unsigned long);
static void afs_process_async_call(struct work_struct *); static void afs_process_async_call(struct work_struct *);
static void afs_rx_new_call(struct sock *, struct rxrpc_call *, unsigned long); static void afs_rx_new_call(struct sock *, struct rxrpc_call *, unsigned long);
@ -320,8 +320,8 @@ static int afs_send_pages(struct afs_call *call, struct msghdr *msg)
/* /*
* initiate a call * 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) gfp_t gfp, bool async)
{ {
struct rxrpc_call *rxcall; struct rxrpc_call *rxcall;
struct msghdr msg; struct msghdr msg;
@ -415,9 +415,9 @@ error_do_abort:
abort_code = 0; abort_code = 0;
offset = 0; offset = 0;
rxrpc_kernel_recv_data(call->net->socket, rxcall, NULL, rxrpc_kernel_recv_data(call->net->socket, rxcall, NULL,
0, &offset, false, &abort_code, 0, &offset, false, &call->abort_code,
&call->service_id); &call->service_id);
ret = afs_abort_to_error(abort_code); ret = afs_abort_to_error(call->abort_code);
} }
error_kill_call: error_kill_call:
afs_put_call(call); afs_put_call(call);
@ -468,7 +468,7 @@ static void afs_deliver_to_call(struct afs_call *call)
case -EAGAIN: case -EAGAIN:
goto out; goto out;
case -ECONNABORTED: case -ECONNABORTED:
goto call_complete; goto save_error;
case -ENOTCONN: case -ENOTCONN:
abort_code = RX_CALL_DEAD; abort_code = RX_CALL_DEAD;
rxrpc_kernel_abort_call(call->net->socket, call->rxcall, rxrpc_kernel_abort_call(call->net->socket, call->rxcall,
@ -501,7 +501,6 @@ out:
save_error: save_error:
call->error = ret; call->error = ret;
call_complete:
call->state = AFS_CALL_COMPLETE; call->state = AFS_CALL_COMPLETE;
goto done; goto done;
} }
@ -509,10 +508,10 @@ call_complete:
/* /*
* wait synchronously for a call to complete * 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; signed long rtt2, timeout;
int ret; long ret;
u64 rtt; u64 rtt;
u32 life, last_life; u32 life, last_life;
@ -567,9 +566,16 @@ static int afs_wait_for_call_to_complete(struct afs_call *call)
} }
ret = call->error; 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"); _debug("call complete");
afs_put_call(call); afs_put_call(call);
_leave(" = %d", ret); _leave(" = %p", (void *)ret);
return ret; return ret;
} }