summaryrefslogtreecommitdiffstats
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c9
-rw-r--r--source3/smbd/smb2_lock.c6
2 files changed, 5 insertions, 10 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 43fc2a17bf..47ac4cc402 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -725,8 +725,7 @@ void smbd_cancel_pending_lock_requests_by_fid(files_struct *fsp,
messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
- blr->lock_flav,
- blr);
+ blr->lock_flav);
/* We're closing the file fsp here, so ensure
* we don't have a dangling pointer. */
@@ -768,8 +767,7 @@ void remove_pending_lock_requests_by_mid_smb1(
messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
- blr->lock_flav,
- blr);
+ blr->lock_flav);
TALLOC_FREE(br_lck);
}
@@ -867,8 +865,7 @@ void process_blocking_lock_queue(struct smbd_server_connection *sconn)
messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
- blr->lock_flav,
- blr);
+ blr->lock_flav);
}
TALLOC_FREE(br_lck);
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index b11462c54f..07c23df685 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -664,8 +664,7 @@ static void remove_pending_lock(struct smbd_smb2_lock_state *state,
messaging_server_id(blr->fsp->conn->sconn->msg_ctx),
blr->offset,
blr->count,
- blr->lock_flav,
- blr);
+ blr->lock_flav);
TALLOC_FREE(br_lck);
}
}
@@ -860,8 +859,7 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
messaging_server_id(sconn->msg_ctx),
blr->offset,
blr->count,
- blr->lock_flav,
- blr);
+ blr->lock_flav);
/* Finally end the request. */
if (close_type == SHUTDOWN_CLOSE) {