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

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_default.c

index f9d958a003dd831a13588a6d4405268a12afd857..28b8c04dee42eb8cd320bd90be19bcf064c58c99 100644 (file)
@@ -1116,7 +1116,7 @@ static struct tevent_req *vfswrap_fsync_send(struct vfs_handle_struct *handle,
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, vfs_fsync_done, state);
+       tevent_req_set_callback(subreq, vfs_fsync_done, req);
 
        talloc_set_destructor(state, vfs_fsync_state_destructor);
 
@@ -1156,9 +1156,10 @@ static int vfs_fsync_state_destructor(struct vfswrap_fsync_state *state)
 
 static void vfs_fsync_done(struct tevent_req *subreq)
 {
-       struct vfswrap_fsync_state *state = tevent_req_callback_data(
-               subreq, struct vfswrap_fsync_state);
-       struct tevent_req *req = state->req;
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct vfswrap_fsync_state *state = tevent_req_data(
+               req, struct vfswrap_fsync_state);
        int ret;
 
        ret = pthreadpool_tevent_job_recv(subreq);