diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-08 12:27:52 +0100 |
| commit | 3318204d294f3b3ac3409f192edc3eddeada245b (patch) | |
| tree | 442f52cc0c9bae0378c228c85166bcd005e60336 /source3/smbd/oplock_irix.c | |
| parent | ba5d6e6d706ebf07640ee24d701255cbb4803525 (diff) | |
| parent | 3dde0cbb769b92d922be13677ad076cae9b6a693 (diff) | |
| download | samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.gz samba-3318204d294f3b3ac3409f192edc3eddeada245b.tar.bz2 samba-3318204d294f3b3ac3409f192edc3eddeada245b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd/oplock_irix.c')
| -rw-r--r-- | source3/smbd/oplock_irix.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index 8c287c9836..496b0b72ea 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -19,12 +19,10 @@ #define DBGC_CLASS DBGC_LOCKING #include "includes.h" +#include "smbd/globals.h" #if HAVE_KERNEL_OPLOCKS_IRIX -static int oplock_pipe_write = -1; -static int oplock_pipe_read = -1; - /**************************************************************************** Test to see if IRIX kernel oplocks work. ****************************************************************************/ @@ -273,7 +271,6 @@ static bool irix_oplock_msg_waiting(fd_set *fds) struct kernel_oplocks *irix_init_kernel_oplocks(void) { int pfd[2]; - static struct kernel_oplocks koplocks; if (!irix_oplocks_available()) return NULL; @@ -287,13 +284,13 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void) oplock_pipe_read = pfd[0]; oplock_pipe_write = pfd[1]; - koplocks.receive_message = irix_oplock_receive_message; - koplocks.set_oplock = irix_set_kernel_oplock; - koplocks.release_oplock = irix_release_kernel_oplock; - koplocks.msg_waiting = irix_oplock_msg_waiting; - koplocks.notification_fd = oplock_pipe_read; + irix_koplocks.receive_message = irix_oplock_receive_message; + irix_koplocks.set_oplock = irix_set_kernel_oplock; + irix_koplocks.release_oplock = irix_release_kernel_oplock; + irix_koplocks.msg_waiting = irix_oplock_msg_waiting; + irix_koplocks.notification_fd = oplock_pipe_read; - return &koplocks; + return &irix_koplocks; } #else void oplock_irix_dummy(void); |