Revert "s3: VFS: vfs_default. Protect vfs_pread_done() from accessing a freed req...
authorJeremy Allison <jra@samba.org>
Fri, 13 Mar 2020 17:40:19 +0000 (10:40 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 18 Mar 2020 18:03:31 +0000 (18:03 +0000)
This reverts commit b9ad06079fe362385cc4c77f8e8d54f5f74d6db6.

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 21bc9c7adf78099cd42b3a1eedd1a771d09d543b..b8c36180b7c137b034343199b0c1c93d30907a44 100644 (file)
@@ -863,15 +863,6 @@ static void vfs_pread_do(void *private_data)
 
 static int vfs_pread_state_destructor(struct vfswrap_pread_state *state)
 {
-       /*
-        * This destructor only gets called if the request is still
-        * in flight, which is why we deny it by returning -1. We
-        * also set the req pointer to NULL so the _done function
-        * can detect the caller doesn't want the result anymore.
-        *
-        * Forcing the fsp closed by a SHUTDOWN_CLOSE can cause this.
-        */
-       state->req = NULL;
        return -1;
 }
 
@@ -886,17 +877,6 @@ static void vfs_pread_done(struct tevent_req *subreq)
        TALLOC_FREE(subreq);
        SMBPROFILE_BYTES_ASYNC_END(state->profile_bytes);
        talloc_set_destructor(state, NULL);
-       if (req == NULL) {
-               /*
-                * We were shutdown closed in flight. No one
-                * wants the result, and state has been reparented
-                * to the NULL context, so just free it so we
-                * don't leak memory.
-                */
-               DBG_NOTICE("pread request abandoned in flight\n");
-               TALLOC_FREE(state);
-               return;
-       }
        if (ret != 0) {
                if (ret != EAGAIN) {
                        tevent_req_error(req, ret);