summaryrefslogtreecommitdiff
path: root/source3/include/smb.h
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-22 22:49:30 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-22 22:49:30 +0100
commit1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16 (patch)
tree769f8e097b5225d8627bbb6698106000f226754e /source3/include/smb.h
parentebb929779bf9f4aa0cb9695a3ee5ce5d550bcecc (diff)
parent8e2b48e1b7c7fd6b6080f2e56f654b682c6426a3 (diff)
downloadsamba-1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16.tar.gz
samba-1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16.tar.bz2
samba-1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/smb.h')
-rw-r--r--source3/include/smb.h19
1 files changed, 13 insertions, 6 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 799ffe1a46..19d2208ada 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1671,14 +1671,21 @@ enum smbd_capability {
LEASE_CAPABILITY
};
+struct kernel_oplocks_ops;
+struct kernel_oplocks {
+ const struct kernel_oplocks_ops *ops;
+ void *private_data;
+};
+
/* 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 {
- files_struct * (*receive_message)(fd_set *fds);
- bool (*set_oplock)(files_struct *fsp, int oplock_type);
- void (*release_oplock)(files_struct *fsp);
- bool (*msg_waiting)(fd_set *fds);
- int notification_fd;
+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"