s3: locking: Add a const struct lock_context * paramter to set_posix_lock_posix_flavour()
authorJeremy Allison <jra@samba.org>
Tue, 17 May 2016 19:49:36 +0000 (12:49 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 20 May 2016 23:28:27 +0000 (01:28 +0200)
We will need this to implement open file description record locks.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Jeff Layton <jlayton@samba.org>
source3/locking/brlock.c
source3/locking/posix.c
source3/locking/proto.h

index e8c8d890311cbf8554df94a3e189eb5fcabaa8d2..70096d627f02ccb308c1ad3c8ac344dab24a3be9 100644 (file)
@@ -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. */
index 1773b2282ba326c5578f3474fc3bafac396c6019..743eaa1ebb579da4f522bb2b82fea65f4e2422b9 100644 (file)
@@ -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;
index 1eabd6a603cb47a5cb0f792b21228bac51b7c252..13499cfbf41bed1d0c2b3e56ca57c5d701746a39 100644 (file)
@@ -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,