r23185: Try to fix the IRIX build, also add the forgotten file_id.c in .26

diff --git a/source/lib/file_id.c b/source/lib/file_id.c
index 335c1829fb71a28fa3b262a6c5cfcfcfa8c42fe5..18d3397bedc28e49ad4d6749c0d603f71418b8fa 100644 (file)
--- a/source/lib/file_id.c
+++ b/source/lib/file_id.c
@@ -26,7 +26,7 @@
   return a file_id which gives a unique ID for a file given the device and
   inode numbers
  */
-static struct file_id file_id_create(SMB_DEV_T dev, SMB_INO_T inode)
+struct file_id file_id_create(SMB_DEV_T dev, SMB_INO_T inode)
 {
        struct file_id key;
        /* the ZERO_STRUCT ensures padding doesn't break using the key as a

diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c
index 1ac0cb4674cb998c324366d713961fbce9c22c74..eb0164ae50e85ae877d86f48c814d4558cbca283 100644 (file)
--- a/source/smbd/oplock_irix.c
+++ b/source/smbd/oplock_irix.c
@@ -140,8 +140,9 @@ 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((SMB_DEV_T)os.os_dev,
-                                     (SMB_INO_T)os.os_ino)) == NULL) {
+       if ((fsp = file_find_di_first(
+                    file_id_create((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 ));