sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

smbd: Remove unused "msg_ctx" from do_unlock()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2019-07-01 15:33:58 +02:00 committed by Jeremy Allison
parent 316365805a
commit 0658626776
4 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/locking/locking.c
View File

@ -307,12 +307,11 @@ NTSTATUS do_lock(files_struct *fsp,
Utility function called by unlocking requests.
****************************************************************************/
NTSTATUS do_unlock(struct messaging_context *msg_ctx,
files_struct *fsp,
uint64_t smblctx,
uint64_t count,
uint64_t offset,
enum brl_flavour lock_flav)
NTSTATUS do_unlock(files_struct *fsp,
uint64_t smblctx,
uint64_t count,
uint64_t offset,
enum brl_flavour lock_flav)
{
bool ok = False;
struct byte_range_lock *br_lck = NULL;

11
source3/locking/proto.h
View File

@ -104,12 +104,11 @@ NTSTATUS do_lock(files_struct *fsp,
enum brl_flavour lock_flav,
struct server_id *pblocker_pid,
uint64_t *psmblctx);
NTSTATUS do_unlock(struct messaging_context *msg_ctx,
files_struct *fsp,
uint64_t smblctx,
uint64_t count,
uint64_t offset,
enum brl_flavour lock_flav);
NTSTATUS do_unlock(files_struct *fsp,
uint64_t smblctx,
uint64_t count,
uint64_t offset,
enum brl_flavour lock_flav);
void locking_close_file(struct messaging_context *msg_ctx,
files_struct *fsp,
enum file_close_type close_type);

3
source3/smbd/blocking.c
View File

@ -85,8 +85,7 @@ NTSTATUS smbd_do_locks_try(
*/
for (i = i-1; i != UINT16_MAX; i--) {
struct smbd_lock_element *e = &locks[i];
do_unlock(msg_ctx,
fsp,
do_unlock(fsp,
e->smblctx,
e->count,
e->offset,

12
source3/smbd/reply.c
View File

@ -8202,12 +8202,12 @@ NTSTATUS smbd_do_unlocking(struct smb_request *req,
goto done;
}
status = do_unlock(req->sconn->msg_ctx,
fsp,
e->smblctx,
e->count,
e->offset,
lock_flav);
status = do_unlock(
fsp,
e->smblctx,
e->count,
e->offset,
lock_flav);
DEBUG(10, ("%s: unlock returned %s\n", __func__,
nt_errstr(status)));