svn commit: samba r24656 - in branches/SAMBA_3_2_0/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-25 15:28:53 +0000 (Sat, 25 Aug 2007)
New Revision: 24656

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

Log:
Janitor for metze:

try to fix the build on irix...

metze


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


Changeset:
Modified: branches/SAMBA_3_2_0/source/smbd/oplock_irix.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/oplock_irix.c	2007-08-24 22:58:29 UTC (rev 24655)
+++ branches/SAMBA_3_2_0/source/smbd/oplock_irix.c	2007-08-25 15:28:53 UTC (rev 24656)
@@ -96,6 +96,7 @@
 	extern int smb_read_error;
 	oplock_stat_t os;
 	char dummy;
+	struct file_id fileid;
 	files_struct *fsp;
 
 	/* Ensure we only get one call per select fd set. */
@@ -137,11 +138,14 @@
 	/*
 	 * We only have device and inode info here - we have to guess that this
 	 * is the first fsp open with this dev,ino pair.
+	 *
+	 * NOTE: this doesn't work if any VFS modules overloads
+	 *       the file_id_create() hook!
 	 */
 
-	if ((fsp = file_find_di_first(
-		     file_id_create((SMB_DEV_T)os.os_dev,
-				    (SMB_INO_T)os.os_ino))) == NULL) {
+	fileid = file_id_create_dev((SMB_DEV_T)os.os_dev,
+				    (SMB_INO_T)os.os_ino);
+	if ((fsp = file_find_di_first(fileid)) == NULL) {
 		DEBUG(0,("irix_oplock_receive_message: unable to find open "
 			 "file with dev = %x, inode = %.0f\n",
 			 (unsigned int)os.os_dev, (double)os.os_ino ));