summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-29 10:48:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:53 -0500
commitfb76516ccd06bd5d2e013d07c4477e28df74962a (patch)
tree253ab2e3e45b6c75eaaf5439b1ed14f8252f9d3c
parent7bffc4175762dfb9726ce68f338392d23cc47553 (diff)
downloadsamba-fb76516ccd06bd5d2e013d07c4477e28df74962a.tar.gz
samba-fb76516ccd06bd5d2e013d07c4477e28df74962a.tar.bz2
samba-fb76516ccd06bd5d2e013d07c4477e28df74962a.zip
r23185: Try to fix the IRIX build, also add the forgotten file_id.c in .26
(This used to be commit 5360e6405b170137e558fd0696ebd6030e0f5deb)
-rw-r--r--source3/lib/file_id.c2
-rw-r--r--source3/smbd/oplock_irix.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/lib/file_id.c b/source3/lib/file_id.c
index 335c1829fb..18d3397bed 100644
--- a/source3/lib/file_id.c
+++ b/source3/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/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 1ac0cb4674..eb0164ae50 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/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 ));