diff options
| author | Jeremy Allison <jra@samba.org> | 2002-05-22 01:04:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-05-22 01:04:58 +0000 |
| commit | 3c1ff07fa414636dee1f67832c943028223ff703 (patch) | |
| tree | 8ea5ea10b1e30028fc071fa0777432c9727596b9 /source3/smbd/oplock_linux.c | |
| parent | dc86e2b710048653fa75a3c39ca8a153a5a10e23 (diff) | |
| download | samba-3c1ff07fa414636dee1f67832c943028223ff703.tar.gz samba-3c1ff07fa414636dee1f67832c943028223ff703.tar.bz2 samba-3c1ff07fa414636dee1f67832c943028223ff703.zip | |
Merge of receive_local_message fix from 2.2.5.
Jeremy.
(This used to be commit d4dbb9cb1338332bda3651dc4b86abcf47e9c2d2)
Diffstat (limited to 'source3/smbd/oplock_linux.c')
| -rw-r--r-- | source3/smbd/oplock_linux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index d946578380..372ad857c4 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -136,7 +136,7 @@ static BOOL linux_oplock_receive_message(fd_set *fds, char *buffer, int buffer_l goto out; } - DEBUG(3,("receive_local_message: kernel oplock break request received for \ + DEBUG(3,("linux_oplock_receive_message: kernel oplock break request received for \ dev = %x, inode = %.0f\n", (unsigned int)fsp->dev, (double)fsp->inode )); /* @@ -171,14 +171,14 @@ dev = %x, inode = %.0f\n", (unsigned int)fsp->dev, (double)fsp->inode )); static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type) { if (linux_setlease(fsp->fd, F_WRLCK) == -1) { - DEBUG(3,("set_file_oplock: Refused oplock on file %s, fd = %d, dev = %x, \ + DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, fd = %d, dev = %x, \ inode = %.0f. (%s)\n", fsp->fsp_name, fsp->fd, (unsigned int)fsp->dev, (double)fsp->inode, strerror(errno))); return False; } - DEBUG(3,("set_file_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %lu\n", + DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, dev = %x, inode = %.0f, file_id = %lu\n", fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id)); return True; @@ -196,7 +196,7 @@ static void linux_release_kernel_oplock(files_struct *fsp) * oplock state of this file. */ int state = fcntl(fsp->fd, F_GETLEASE, 0); - dbgtext("release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %lu has kernel \ + dbgtext("linux_release_kernel_oplock: file %s, dev = %x, inode = %.0f file_id = %lu has kernel \ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id, state ); } @@ -206,7 +206,7 @@ oplock state of %x.\n", fsp->fsp_name, (unsigned int)fsp->dev, */ if (linux_setlease(fsp->fd, F_UNLCK) == -1) { if (DEBUGLVL(0)) { - dbgtext("release_kernel_oplock: Error when removing kernel oplock on file " ); + dbgtext("linux_release_kernel_oplock: Error when removing kernel oplock on file " ); dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. Error was %s\n", fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, fsp->file_id, strerror(errno) ); |