Revert "s3: VFS: vfs_glusterfs. Pass in struct vfs_gluster_pread_state as the callbac...
authorJeremy Allison <jra@samba.org>
Fri, 13 Mar 2020 17:37:30 +0000 (10:37 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 18 Mar 2020 18:03:30 +0000 (18:03 +0000)
This reverts commit c6c4e2de22cd3d84f45f5c21e6b09b09274f7f7b.

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>
source3/modules/vfs_glusterfs.c

index 84b284152c675dc43bd1e66f6d402c6c47dca9ec..6598aadad17413a88f32f520ae5f343d04d9285c 100644 (file)
@@ -766,7 +766,7 @@ static struct tevent_req *vfs_gluster_pread_send(struct vfs_handle_struct
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, vfs_gluster_pread_done, state);
+       tevent_req_set_callback(subreq, vfs_gluster_pread_done, req);
 
        talloc_set_destructor(state, vfs_gluster_pread_state_destructor);
 
@@ -812,9 +812,10 @@ static int vfs_gluster_pread_state_destructor(struct vfs_gluster_pread_state *st
 
 static void vfs_gluster_pread_done(struct tevent_req *subreq)
 {
-       struct vfs_gluster_pread_state *state = tevent_req_callback_data(
-               subreq, struct vfs_gluster_pread_state);
-       struct tevent_req *req = state->req;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct vfs_gluster_pread_state *state = tevent_req_data(
+               req, struct vfs_gluster_pread_state);
        int ret;
 
        ret = pthreadpool_tevent_job_recv(subreq);