sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s3: smbd: Remove all references to fsp->deferred_close.

Browse Source 
We are now free to remove it from struct files_struct.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2020-03-18 16:01:18 -07:00 committed by Ralph Boehme
parent b686de4e7b
commit 76b9a3597c
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/modules/offload_token.c
View File

@ -270,16 +270,6 @@ NTSTATUS vfs_offload_token_check_handles(uint32_t fsctl,
return NT_STATUS_ACCESS_DENIED;
}
if (src_fsp->deferred_close != NULL) {
DBG_INFO("copy chunk src handle with deferred close.\n");
return NT_STATUS_ACCESS_DENIED;
}
if (dst_fsp->deferred_close != NULL) {
DBG_INFO("copy chunk dst handle with deferred close.\n");
return NT_STATUS_ACCESS_DENIED;
}
if (src_fsp->closing) {
DBG_INFO("copy chunk src handle with closing in progress.\n");
return NT_STATUS_ACCESS_DENIED;

1
source3/smbd/aio.c
View File

@ -102,7 +102,6 @@ static int aio_del_req_from_fsp(struct aio_req_fsp_link *lnk)
fsp->aio_requests[i] = fsp->aio_requests[fsp->num_aio_requests];
if (fsp->num_aio_requests == 0) {
tevent_wait_done(fsp->deferred_close);
TALLOC_FREE(fsp->aio_requests);
}
return 0;

14
source3/smbd/files.c
View File

@ -578,9 +578,6 @@ files_struct *file_fsp(struct smb_request *req, uint16_t fid)
}
if (req->chain_fsp != NULL) {
if (req->chain_fsp->deferred_close) {
return NULL;
}
if (req->chain_fsp->closing) {
return NULL;
}
@ -604,10 +601,6 @@ files_struct *file_fsp(struct smb_request *req, uint16_t fid)
return NULL;
}
if (fsp->deferred_close) {
return NULL;
}
if (fsp->closing) {
return NULL;
}
@ -655,10 +648,6 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
return NULL;
}
if (fsp->deferred_close) {
return NULL;
}
if (fsp->closing) {
return NULL;
}
@ -673,9 +662,6 @@ struct files_struct *file_fsp_smb2(struct smbd_smb2_request *smb2req,
struct files_struct *fsp;
if (smb2req->compat_chain_fsp != NULL) {
if (smb2req->compat_chain_fsp->deferred_close) {
return NULL;
}
if (smb2req->compat_chain_fsp->closing) {
return NULL;
}