diff options
| author | Volker Lendecke <vl@samba.org> | 2019-06-20 12:20:39 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-06-20 17:18:18 +0000 |
| commit | 67f89bb3300a4cedd2bb01f81a6ede21b05377e0 (patch) | |
| tree | 8f4e36a2e1c95ce0d88c172edfce6e889f6decb3 /source3/locking | |
| parent | ca73ba859ed91f272504c31d1f56f9315b7ef5c0 (diff) | |
| download | samba-67f89bb3300a4cedd2bb01f81a6ede21b05377e0.tar.gz | |
smbd: Return "blocker_pid" from do_lock()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/locking.c | 4 | ||||
| -rw-r--r-- | source3/locking/proto.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 969be706147..17ecfd08fff 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -243,6 +243,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, enum brl_flavour lock_flav, bool blocking_lock, NTSTATUS *perr, + struct server_id *pblocker_pid, uint64_t *psmblctx) { struct byte_range_lock *br_lck = NULL; @@ -294,6 +295,9 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, if (psmblctx != NULL) { *psmblctx = blocker_smblctx; } + if (pblocker_pid != NULL) { + *pblocker_pid = blocker_pid; + } DEBUG(10, ("do_lock: returning status=%s\n", nt_errstr(*perr))); diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 13883875521..273d3666d37 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -123,6 +123,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, enum brl_flavour lock_flav, bool blocking_lock, NTSTATUS *perr, + struct server_id *pblocker_pid, uint64_t *psmblctx); NTSTATUS do_unlock(struct messaging_context *msg_ctx, files_struct *fsp, |