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

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 52c33725b8d7d8eb5e0a8805190625e24dbefe52..456e0c8a4989b545e31a536ce618f482fdbf0bfb 100644 (file)
@@ -926,7 +926,7 @@ static struct tevent_req *vfs_gluster_pwrite_send(struct vfs_handle_struct
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, vfs_gluster_pwrite_done, state);
+       tevent_req_set_callback(subreq, vfs_gluster_pwrite_done, req);
 
        talloc_set_destructor(state, vfs_gluster_pwrite_state_destructor);
 
@@ -972,9 +972,10 @@ static int vfs_gluster_pwrite_state_destructor(struct vfs_gluster_pwrite_state *
 
 static void vfs_gluster_pwrite_done(struct tevent_req *subreq)
 {
-       struct vfs_gluster_pwrite_state *state = tevent_req_callback_data(
-               subreq, struct vfs_gluster_pwrite_state);
-       struct tevent_req *req = state->req;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct vfs_gluster_pwrite_state *state = tevent_req_data(
+               req, struct vfs_gluster_pwrite_state);
        int ret;
 
        ret = pthreadpool_tevent_job_recv(subreq);