s3: locking: Add a const struct lock_context * paramter to set_posix_lock_posix_flavour()

[sharpe/samba-autobuild/.git] / source3 / locking / proto.h

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 652ec2a4c66e12c69abb62eccfdfe7b7302fc7c4..13499cfbf41bed1d0c2b3e56ca57c5d701746a39 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -202,7 +202,8 @@ int share_mode_forall(int (*fn)(struct file_id fid,
                                const struct share_mode_data *data,
                                void *private_data),
                      void *private_data);
-int share_entry_forall(int (*fn)(const struct share_mode_entry *, const char *,
+int share_entry_forall(int (*fn)(const struct share_mode_entry *,
+                                const char *, const char *,
                                 const char *, void *),
                      void *private_data);
 bool share_mode_cleanup_disconnected(struct file_id id,
@@ -218,7 +219,7 @@ bool is_posix_locked(files_struct *fsp,
                        enum brl_flavour lock_flav);
 bool posix_locking_init(bool read_only);
 bool posix_locking_end(void);
-int fd_close_posix(struct files_struct *fsp);
+int fd_close_posix(const struct files_struct *fsp);
 bool set_posix_lock_windows_flavour(files_struct *fsp,
                        uint64_t u_offset,
                        uint64_t u_count,
@@ -238,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,