[GLUE] Rsync SAMBA_3_0 SVN r25598 in order to create the v3-0-test branch.samba-misc-tags/initial-v3-0-test

1 files changed, 24 insertions, 25 deletions

diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c
index eb0164ae50e..c1159cd73b4 100644
--- a/source/smbd/oplock_irix.c
+++ b/source/smbd/oplock_irix.c
@@ -140,9 +140,8 @@ static files_struct *irix_oplock_receive_message(fd_set *fds)
 	 * is the first fsp open with this dev,ino pair.
 	 */
 
-	if ((fsp = file_find_di_first(
-		     file_id_create((SMB_DEV_T)os.os_dev,
-				    (SMB_INO_T)os.os_ino))) == NULL) {
+	if ((fsp = file_find_di_first((SMB_DEV_T)os.os_dev,
+				      (SMB_INO_T)os.os_ino)) == 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 ));
@@ -150,9 +149,9 @@ static files_struct *irix_oplock_receive_message(fd_set *fds)
 	}
      
 	DEBUG(5,("irix_oplock_receive_message: kernel oplock break request "
-		 "received for file_id %s gen_id = %ul",
-		 file_id_static_string(&fsp->file_id),
-		 fsp->fh->gen_id ));
+		 "received for dev = %x, inode = %.0f\n, file_id = %ul",
+		 (unsigned int)fsp->dev, (double)fsp->inode,
+		 fsp->fh->file_id ));
 
 	return fsp;
 }
@@ -166,27 +165,27 @@ static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type)
 	if (sys_fcntl_long(fsp->fh->fd, F_OPLKREG, oplock_pipe_write) == -1) {
 		if(errno != EAGAIN) {
 			DEBUG(0,("irix_set_kernel_oplock: Unable to get "
-				 "kernel oplock on file %s, file_id %s "
-				 "gen_id = %ul. Error was %s\n", 
-				 fsp->fsp_name, file_id_static_string(&fsp->file_id), 
-				 fsp->fh->gen_id,
+				 "kernel oplock on file %s, dev = %x, inode "
+				 "= %.0f, file_id = %ul. Error was %s\n", 
+				 fsp->fsp_name, (unsigned int)fsp->dev,
+				 (double)fsp->inode, fsp->fh->file_id,
 				 strerror(errno) ));
 		} else {
 			DEBUG(5,("irix_set_kernel_oplock: Refused oplock on "
-				 "file %s, fd = %d, file_id = 5s, "
-				 "gen_id = %ul. Another process had the file "
+				 "file %s, fd = %d, dev = %x, inode = %.0f, "
+				 "file_id = %ul. Another process had the file "
 				 "open.\n",
 				 fsp->fsp_name, fsp->fh->fd,
-				 file_id_static_string(&fsp->file_id),
-				 fsp->fh->gen_id ));
+				 (unsigned int)fsp->dev, (double)fsp->inode,
+				 fsp->fh->file_id ));
 		}
 		return False;
 	}
 	
-	DEBUG(10,("irix_set_kernel_oplock: got kernel oplock on file %s, file_id = %s "
-		  "gen_id = %ul\n",
-		  fsp->fsp_name, file_id_static_string(&fsp->file_id),
-		  fsp->fh->gen_id));
+	DEBUG(10,("irix_set_kernel_oplock: got kernel oplock on file %s, dev "
+		  "= %x, inode = %.0f, file_id = %ul\n",
+		  fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode,
+		  fsp->fh->file_id));
 
 	return True;
 }
@@ -203,10 +202,10 @@ static void irix_release_kernel_oplock(files_struct *fsp)
 		 * oplock state of this file.
 		 */
 		int state = sys_fcntl_long(fsp->fh->fd, F_OPLKACK, -1);
-		dbgtext("irix_release_kernel_oplock: file %s, file_id = %s"
-			"gen_id = %ul, has kernel oplock state "
-			"of %x.\n", fsp->fsp_name, file_id_static_string(&fsp->file_id),
-                        fsp->fh->gen_id, state );
+		dbgtext("irix_release_kernel_oplock: file %s, dev = %x, "
+			"inode = %.0f file_id = %ul, has kernel oplock state "
+			"of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev,
+                        (double)fsp->inode, fsp->fh->file_id, state );
 	}
 
 	/*
@@ -216,10 +215,10 @@ static void irix_release_kernel_oplock(files_struct *fsp)
 		if( DEBUGLVL( 0 )) {
 			dbgtext("irix_release_kernel_oplock: Error when "
 				"removing kernel oplock on file " );
-			dbgtext("%s, file_id = %s gen_id = %ul. "
+			dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. "
 				"Error was %s\n",
-				fsp->fsp_name, file_id_static_string(&fsp->file_id),
-				fsp->fh->gen_id,
+				fsp->fsp_name, (unsigned int)fsp->dev, 
+				(double)fsp->inode, fsp->fh->file_id,
 				strerror(errno) );
 		}
 	}