diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-22 22:49:30 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-22 22:49:30 +0100 |
| commit | 1fcd85e8b9235301c7bc6c4c0878e73ddcbd4b16 (patch) | |
| tree | 769f8e097b5225d8627bbb6698106000f226754e /source3/smbd/globals.h | |
| parent | ebb929779bf9f4aa0cb9695a3ee5ce5d550bcecc (diff) | |
| parent | 8e2b48e1b7c7fd6b6080f2e56f654b682c6426a3 (diff) | |
| download | samba-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/smbd/globals.h')
| -rw-r--r-- | source3/smbd/globals.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 157089f37c..2c4f8b5821 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -188,20 +188,13 @@ extern char *LastDir; extern SIG_ATOMIC_T oplock_signals_received; #define FD_PENDING_SIZE 100 extern SIG_ATOMIC_T fd_pending_array[FD_PENDING_SIZE]; -extern struct kernel_oplocks linux_koplocks; -#endif - -#if HAVE_KERNEL_OPLOCKS_IRIX -extern int oplock_pipe_write; -extern int oplock_pipe_read; -extern struct kernel_oplocks irix_koplocks; #endif /* Current number of oplocks we have outstanding. */ extern int32_t exclusive_oplocks_open; extern int32_t level_II_oplocks_open; extern bool global_client_failed_oplock_break; -extern const struct kernel_oplocks *koplocks; +extern struct kernel_oplocks *koplocks; extern struct notify_mid_map *notify_changes_by_mid; |