diff options
Diffstat (limited to 'source/smbd/oplock_linux.c')
| -rw-r--r-- | source/smbd/oplock_linux.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/smbd/oplock_linux.c b/source/smbd/oplock_linux.c index e12a9d66ca9..14db98cde6c 100644 --- a/source/smbd/oplock_linux.c +++ b/source/smbd/oplock_linux.c @@ -167,17 +167,17 @@ static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type) { if ( SMB_VFS_LINUX_SETLEASE(fsp,fsp->fh->fd, F_WRLCK) == -1) { DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, " - "fd = %d, file_id = %s. (%s)\n", + "fd = %d, dev = %x, inode = %.0f. (%s)\n", fsp->fsp_name, fsp->fh->fd, - file_id_static_string(&fsp->file_id), + (unsigned int)fsp->dev, (double)fsp->inode, strerror(errno))); return False; } DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, " - "file_id = %s gen_id = %lu\n", - fsp->fsp_name, file_id_static_string(&fsp->file_id), - fsp->fh->gen_id)); + "dev = %x, inode = %.0f, file_id = %lu\n", + fsp->fsp_name, (unsigned int)fsp->dev, (double)fsp->inode, + fsp->fh->file_id)); return True; } @@ -194,10 +194,10 @@ static void linux_release_kernel_oplock(files_struct *fsp) * oplock state of this file. */ int state = fcntl(fsp->fh->fd, F_GETLEASE, 0); - dbgtext("linux_release_kernel_oplock: file %s, file_id = %s " - "gen_id = %lu has kernel oplock state " - "of %x.\n", fsp->fsp_name, file_id_static_string(&fsp->file_id), - fsp->fh->gen_id, state ); + 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->fh->file_id, state ); } /* @@ -207,10 +207,10 @@ static void linux_release_kernel_oplock(files_struct *fsp) if (DEBUGLVL(0)) { dbgtext("linux_release_kernel_oplock: Error when " "removing kernel oplock on file " ); - dbgtext("%s, file_id = %s, gen_id = %lu. " + dbgtext("%s, dev = %x, inode = %.0f, file_id = %lu. " "Error was %s\n", fsp->fsp_name, - file_id_static_string(&fsp->file_id), - fsp->fh->gen_id, strerror(errno) ); + (unsigned int)fsp->dev, (double)fsp->inode, + fsp->fh->file_id, strerror(errno) ); } } } |