diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-09-10 10:56:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:36 -0500 |
| commit | 4ee8b2937d48308c6089fb539fdbd8625dfde360 (patch) | |
| tree | 738ce5408f32af68a66d8545257e7d226c2a7586 /source3/smbd/oplock_linux.c | |
| parent | 3428c63aa74f46c3db65736bf1c56502fad2362c (diff) | |
| download | samba-4ee8b2937d48308c6089fb539fdbd8625dfde360.tar.gz | |
r25055: Add file_id_string_tos
This removes file_id_string_static and file_id_string_static2
(This used to be commit 638c848c9afe374feb30e34c494f89b2a6c64f7b)
Diffstat (limited to 'source3/smbd/oplock_linux.c')
| -rw-r--r-- | source3/smbd/oplock_linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 66ed9000155..b07c2644a90 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -168,14 +168,14 @@ static BOOL linux_set_kernel_oplock(files_struct *fsp, int oplock_type) DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, " "fd = %d, file_id = %s. (%s)\n", fsp->fsp_name, fsp->fh->fd, - file_id_static_string(&fsp->file_id), + file_id_string_tos(&fsp->file_id), 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->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id)); return True; @@ -195,7 +195,7 @@ static void linux_release_kernel_oplock(files_struct *fsp) 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), + "of %x.\n", fsp->fsp_name, file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, state ); } @@ -208,7 +208,7 @@ static void linux_release_kernel_oplock(files_struct *fsp) "removing kernel oplock on file " ); dbgtext("%s, file_id = %s, gen_id = %lu. " "Error was %s\n", fsp->fsp_name, - file_id_static_string(&fsp->file_id), + file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, strerror(errno) ); } } |