sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

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

Browse Source 
(This used to be commit 5360e6405b170137e558fd0696ebd6030e0f5deb)
This commit is contained in:
Volker Lendecke 2007-05-29 10:48:42 +00:00 committed by Gerald (Jerry) Carter
parent 7bffc41757
commit fb76516ccd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/lib/file_id.c
View File

@ -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

5
source3/smbd/oplock_irix.c
View File

@ -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 ));