sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3:smbd: remove now unused check if fsp is NULL

Browse Source 
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>
This commit is contained in:
Ralph Boehme 2018-10-31 10:21:31 +01:00 committed by Jeremy Allison
parent 07eb805cde
commit 3fa45900c0
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/smbd/aio.c
View File

@ -750,14 +750,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. */
@ -913,14 +905,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);