diff options
| author | James Peach <jpeach@samba.org> | 2006-02-13 04:07:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:05 -0500 |
| commit | 8fbdd112b2c69a54d05807163bfc52b34f4d0424 (patch) | |
| tree | 838fb54ed67656e49ac9f2780b5b2ae4d0eaa8b2 /source3/smbd/oplock.c | |
| parent | 71247a2f0507d13fa37d5b3c7136e299995af877 (diff) | |
| download | samba-8fbdd112b2c69a54d05807163bfc52b34f4d0424.tar.gz samba-8fbdd112b2c69a54d05807163bfc52b34f4d0424.tar.bz2 samba-8fbdd112b2c69a54d05807163bfc52b34f4d0424.zip | |
r13482: Push the FAM notification file descriptor into the select
set to avoid unnecessary polling.
(This used to be commit 1dce945ccbba25092cf54890301c8f78f8aede33)
Diffstat (limited to 'source3/smbd/oplock.c')
| -rw-r--r-- | source3/smbd/oplock.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 755bcffc7f..41eb809909 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -240,21 +240,16 @@ BOOL downgrade_oplock(files_struct *fsp) } /**************************************************************************** - Setup the listening set of file descriptors for an oplock break - message either from the UDP socket or from the kernel. Returns the maximum - fd used. + Return the fd (if any) used for receiving oplock notifications. ****************************************************************************/ -int setup_oplock_select_set( fd_set *fds) +int oplock_notify_fd(void) { - int maxfd = 0; - - if (koplocks && koplocks->notification_fd != -1) { - FD_SET(koplocks->notification_fd, fds); - maxfd = MAX(maxfd, koplocks->notification_fd); + if (koplocks) { + return koplocks->notification_fd; } - return maxfd; + return -1; } /**************************************************************************** |