From: Jeremy Allison Date: Tue, 17 May 2016 19:49:36 +0000 (-0700) Subject: s3: locking: Add a const struct lock_context * paramter to set_posix_lock_posix_flavour() X-Git-Tag: tdb-1.3.10~1088 X-Git-Url: http://git.samba.org/samba.git/?p=sharpe%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=a3cb0a4c2788a594f080082a6d8973db86950879 s3: locking: Add a const struct lock_context * paramter to set_posix_lock_posix_flavour() We will need this to implement open file description record locks. Signed-off-by: Jeremy Allison Reviewed-by: Jeff Layton --- diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index e8c8d890311..70096d627f0 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -923,6 +923,7 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx, plock->start, plock->size, plock->lock_type, + &plock->context, &errno_ret)) { /* We don't know who blocked us. */ diff --git a/source3/locking/posix.c b/source3/locking/posix.c index 1773b2282ba..743eaa1ebb5 100644 --- a/source3/locking/posix.c +++ b/source3/locking/posix.c @@ -1192,6 +1192,7 @@ bool set_posix_lock_posix_flavour(files_struct *fsp, uint64_t u_offset, uint64_t u_count, enum brl_type lock_type, + const struct lock_context *lock_ctx, int *errno_ret) { off_t offset; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 1eabd6a603c..13499cfbf41 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -239,6 +239,7 @@ bool set_posix_lock_posix_flavour(files_struct *fsp, uint64_t u_offset, uint64_t u_count, enum brl_type lock_type, + const struct lock_context *lock_ctx, int *errno_ret); bool release_posix_lock_posix_flavour(files_struct *fsp, uint64_t u_offset,