diff options
| author | Volker Lendecke <vlendec@samba.org> | 2005-07-08 07:54:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:18 -0500 |
| commit | a32a7969c598b32c58fad4a7d1cb88cafb4a9e26 (patch) | |
| tree | f10b62a6a5b76081c5d59ceaff8089a85e28ee23 /source3 | |
| parent | af8a691db11a5072865f8b03fd1cbd3aab5cb6d7 (diff) | |
| download | samba-a32a7969c598b32c58fad4a7d1cb88cafb4a9e26.tar.gz samba-a32a7969c598b32c58fad4a7d1cb88cafb4a9e26.tar.xz samba-a32a7969c598b32c58fad4a7d1cb88cafb4a9e26.zip | |
r8231: Patch from James Peach to fix the IRIX build.
Thanks,
Volker
(This used to be commit 1ebb3aa0d5007c470862e3adca92d2941ffa294c)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/oplock_irix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index ffcf3d0af4d..f4405a021e1 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -164,7 +164,7 @@ dev = %x, inode = %.0f\n, file_id = %ul", (unsigned int)fsp->dev, (double)fsp->i static BOOL irix_set_kernel_oplock(files_struct *fsp, int oplock_type) { - if (sys_fcntl_long(fsp->fd, F_OPLKREG, oplock_pipe_write) == -1) { + 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, dev = %x, \ inode = %.0f, file_id = %ul. Error was %s\n", @@ -173,7 +173,7 @@ inode = %.0f, file_id = %ul. Error was %s\n", } else { DEBUG(5,("irix_set_kernel_oplock: Refused oplock on file %s, fd = %d, dev = %x, \ inode = %.0f, file_id = %ul. Another process had the file open.\n", - fsp->fsp_name, fsp->fd, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id )); + fsp->fsp_name, fsp->fh->fd, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id )); } return False; } @@ -195,7 +195,7 @@ static void irix_release_kernel_oplock(files_struct *fsp) * Check and print out the current kernel * oplock state of this file. */ - int state = sys_fcntl_long(fsp->fd, F_OPLKACK, -1); + int state = sys_fcntl_long(fsp->fh->fd, F_OPLKACK, -1); 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->file_id, state ); @@ -204,7 +204,7 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, /* * Remove the kernel oplock on this file. */ - if(sys_fcntl_long(fsp->fd, F_OPLKACK, OP_REVOKE) < 0) { + if(sys_fcntl_long(fsp->fh->fd, F_OPLKACK, OP_REVOKE) < 0) { if( DEBUGLVL( 0 )) { dbgtext("irix_release_kernel_oplock: Error when removing kernel oplock on file " ); dbgtext("%s, dev = %x, inode = %.0f, file_id = %ul. Error was %s\n", |