diff options
| author | Volker Lendecke <vl@samba.org> | 2019-07-01 15:17:27 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-07-02 17:01:27 +0000 |
| commit | 4d75c0aa53ad5f319e8f3eb59edc1b6571a4825e (patch) | |
| tree | 40658f35c1f3cd01793b01e75269687dd5638767 /source3 | |
| parent | b809e68c12f35ec1f2d6aac37d2a28706b91be62 (diff) | |
| download | samba-4d75c0aa53ad5f319e8f3eb59edc1b6571a4825e.tar.gz | |
smbd: Remove unused "msg_ctx" from do_lock()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/locking/locking.c | 3 | ||||
| -rw-r--r-- | source3/locking/proto.h | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_fruit.c | 4 | ||||
| -rw-r--r-- | source3/smbd/blocking.c | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 5b91aa89f26..b6f937df013 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -230,8 +230,7 @@ static void decrement_current_lock_count(files_struct *fsp, Utility function called by locking requests. ****************************************************************************/ -NTSTATUS do_lock(struct messaging_context *msg_ctx, - files_struct *fsp, +NTSTATUS do_lock(files_struct *fsp, uint64_t smblctx, uint64_t count, uint64_t offset, diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 0d1d367fbab..88af69f4c91 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -99,8 +99,7 @@ NTSTATUS query_lock(files_struct *fsp, uint64_t *poffset, enum brl_type *plock_type, enum brl_flavour lock_flav); -NTSTATUS do_lock(struct messaging_context *msg_ctx, - files_struct *fsp, +NTSTATUS do_lock(files_struct *fsp, uint64_t smblctx, uint64_t count, uint64_t offset, diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index bf87de5c5f6..78ea5140464 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -2745,7 +2745,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, if (access_mask & FILE_READ_DATA) { off = access_to_netatalk_brl(fork_type, FILE_READ_DATA); status = do_lock( - handle->conn->sconn->msg_ctx, fsp, fsp->op->global->open_persistent_id, 1, @@ -2763,7 +2762,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, if (!share_for_read) { off = denymode_to_netatalk_brl(fork_type, DENY_READ); status = do_lock( - handle->conn->sconn->msg_ctx, fsp, fsp->op->global->open_persistent_id, 1, @@ -2781,7 +2779,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, if (access_mask & FILE_WRITE_DATA) { off = access_to_netatalk_brl(fork_type, FILE_WRITE_DATA); status = do_lock( - handle->conn->sconn->msg_ctx, fsp, fsp->op->global->open_persistent_id, 1, @@ -2799,7 +2796,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle, if (!share_for_write) { off = denymode_to_netatalk_brl(fork_type, DENY_WRITE); status = do_lock( - handle->conn->sconn->msg_ctx, fsp, fsp->op->global->open_persistent_id, 1, diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index d7f071aa7be..a0b8a1e8ea7 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -61,7 +61,6 @@ NTSTATUS smbd_do_locks_try( struct smbd_lock_element *e = &locks[i]; status = do_lock( - msg_ctx, fsp, e->smblctx, e->count, |