]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:smbd: remove now unused check if fsp is NULL
authorRalph Boehme <slow@samba.org>
Wed, 31 Oct 2018 09:21:31 +0000 (10:21 +0100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 6 Nov 2018 08:10:23 +0000 (09:10 +0100)
This was used internally to mark an aio request as cancelled. As the aio
cancellation functionality has been removed, we can now also remove this
check.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13667

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 3fa45900c0ada6596daf09aa4c5054974f3394b0)

source3/smbd/aio.c

index a7540ed7b916e4f4ccf9b56b71c25cd0f970a2cc..b0a5c76ac7ae2018cf2174157bc13138fe2a3893 100644 (file)
@@ -773,14 +773,6 @@ static void aio_pread_smb2_done(struct tevent_req *req)
        DEBUG(10, ("pread_recv returned %d, err = %s\n", (int)nread,
                   (nread == -1) ? strerror(vfs_aio_state.error) : "no error"));
 
-       if (fsp == NULL) {
-               DEBUG(3, ("%s: request cancelled (mid[%ju])\n",
-                         __func__, (uintmax_t)aio_ex->smbreq->mid));
-               TALLOC_FREE(aio_ex);
-               tevent_req_nterror(subreq, NT_STATUS_INTERNAL_ERROR);
-               return;
-       }
-
        /* Common error or success code processing for async or sync
           read returns. */
 
@@ -938,14 +930,6 @@ static void aio_pwrite_smb2_done(struct tevent_req *req)
        DEBUG(10, ("pwrite_recv returned %d, err = %s\n", (int)nwritten,
                   (nwritten == -1) ? strerror(err) : "no error"));
 
-       if (fsp == NULL) {
-               DEBUG(3, ("%s: request cancelled (mid[%ju])\n",
-                         __func__, (uintmax_t)aio_ex->smbreq->mid));
-               TALLOC_FREE(aio_ex);
-               tevent_req_nterror(subreq, NT_STATUS_INTERNAL_ERROR);
-               return;
-       }
-
        mark_file_modified(fsp);
 
         status = smb2_write_complete_nosync(subreq, nwritten, err);