svn commit: samba r13500 - in branches/SAMBA_3_0/source/smbd: .

[jpeach at samba.org]

Author: jpeach
Date: 2006-02-15 01:05:06 +0000 (Wed, 15 Feb 2006)
New Revision: 13500

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13500

Log:
Fix ordering of FD_* arguments.

Modified:
   branches/SAMBA_3_0/source/smbd/oplock_irix.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/oplock_irix.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/oplock_irix.c	2006-02-14 23:00:41 UTC (rev 13499)
+++ branches/SAMBA_3_0/source/smbd/oplock_irix.c	2006-02-15 01:05:06 UTC (rev 13500)
@@ -94,7 +94,7 @@
 	files_struct *fsp;
 
 	/* Ensure we only get one call per select fd set. */
-	FD_CLR(fds, oplock_pipe_read);
+	FD_CLR(oplock_pipe_read, fds);
 
 	/*
 	 * Read one byte of zero to clear the
@@ -220,22 +220,18 @@
 		return False;
 
 	if (fds) {
-		return FD_ISSET(oplock_pipe_read,fds);
+		return FD_ISSET(oplock_pipe_read, fds);
 	}
 
-	FD_ZERO(&myfds);
-	maxfd = setup_oplock_select_set(&myfds);
-	/* Only do the select if we have something to select *on*. */
-	if (maxfd == 0) {
-		return False;
-	}
-
 	/* Do a zero-time select. We just need to find out if there
 	 * are any outstanding messages. We use sys_select_intr as
 	 * we need to ignore any signals. */
 
+	FD_ZERO(&myfds);
+	FD_SET(oplock_pipe_read, &myfds);
+
 	to = timeval_set(0, 0);
-	selrtn = sys_select_intr(maxfd+1,&myfds,NULL,NULL,&to);
+	selrtn = sys_select_intr(oplock_pipe_read+1,&myfds,NULL,NULL,&to);
 	return (selrtn == 1) ? True : False;
 }