sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

Revert "s3: VFS: vfs_default. Pass in struct vfswrap_pread_state as the callback data to the subreq."

Browse Source 
This reverts commit e102908f112866d657b8c0cd6a5b217d070210c8.

Now we wait for all aio to finish on all SHUTDOWN_CLOSE
cases, this is no longer needed.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14301

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-03-13 10:40:33 -07:00
parent ce0235be27
commit 43d5d9b020
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/modules/vfs_default.c
View File

@ -827,7 +827,7 @@ static struct tevent_req *vfswrap_pread_send(struct vfs_handle_struct *handle,
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, vfs_pread_done, state);
tevent_req_set_callback(subreq, vfs_pread_done, req);
talloc_set_destructor(state, vfs_pread_state_destructor);
@ -868,9 +868,10 @@ static int vfs_pread_state_destructor(struct vfswrap_pread_state *state)
static void vfs_pread_done(struct tevent_req *subreq)
{
struct vfswrap_pread_state *state = tevent_req_callback_data(
subreq, struct vfswrap_pread_state);
struct tevent_req *req = state->req;
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct vfswrap_pread_state *state = tevent_req_data(
req, struct vfswrap_pread_state);
int ret;
ret = pthreadpool_tevent_job_recv(subreq);