diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-23 10:08:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-27 15:28:10 +0100 |
| commit | 52f6a4436f9da439fc687894b329898833af7ff8 (patch) | |
| tree | 7d42835050b9876ae520fa4e02a9f697052bb79c /source3/include | |
| parent | 4a2271349503933776f9d2791edfcb874a2c7261 (diff) | |
| download | samba-52f6a4436f9da439fc687894b329898833af7ff8.tar.gz samba-52f6a4436f9da439fc687894b329898833af7ff8.tar.bz2 samba-52f6a4436f9da439fc687894b329898833af7ff8.zip | |
s3:smbd: make kernel oplocks event driven
And use signal events for Linux oplocks.
metze
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 4 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 1713760666..ae49290539 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7018,13 +7018,11 @@ NTSTATUS get_relative_fid_filename(connection_struct *conn, /* The following definitions come from smbd/oplock.c */ int32 get_number_of_exclusive_open_oplocks(void); -bool oplock_message_waiting(void); -void process_kernel_oplocks(struct messaging_context *msg_ctx); +void break_kernel_oplock(struct messaging_context *msg_ctx, files_struct *fsp); bool set_file_oplock(files_struct *fsp, int oplock_type); void release_file_oplock(files_struct *fsp); bool remove_oplock(files_struct *fsp); bool downgrade_oplock(files_struct *fsp); -int oplock_notify_fd(void); void reply_to_oplock_break_requests(files_struct *fsp); void release_level_2_oplocks_on_change(files_struct *fsp); void share_mode_entry_to_message(char *msg, const struct share_mode_entry *e); diff --git a/source3/include/smb.h b/source3/include/smb.h index aa2db693a3..3f71cde395 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1680,12 +1680,10 @@ struct kernel_oplocks { /* if a kernel does support oplocks then a structure of the following typee is used to describe how to interact with the kernel */ struct kernel_oplocks_ops { - files_struct * (*receive_message)(struct kernel_oplocks *ctx); bool (*set_oplock)(struct kernel_oplocks *ctx, files_struct *fsp, int oplock_type); void (*release_oplock)(struct kernel_oplocks *ctx, files_struct *fsp); - bool (*msg_waiting)(struct kernel_oplocks *ctx); }; #include "smb_macros.h" |