diff options
| author | Tim Prouty <tprouty@samba.org> | 2009-07-10 14:50:37 -0700 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-07-20 17:26:56 -0700 |
| commit | 5a8d70d465f28ae02f4df7a3c2905e028c2e3142 (patch) | |
| tree | 12db4653c1e4c2ef23d1368553561d580f832337 /source3/smbd/oplock_linux.c | |
| parent | 635e5e7ff038378d28c52bd5f81d24db99a77a76 (diff) | |
| download | samba-5a8d70d465f28ae02f4df7a3c2905e028c2e3142.tar.gz samba-5a8d70d465f28ae02f4df7a3c2905e028c2e3142.tar.bz2 samba-5a8d70d465f28ae02f4df7a3c2905e028c2e3142.zip | |
s3: Change fsp->fsp_name to be an smb_filename struct!
Diffstat (limited to 'source3/smbd/oplock_linux.c')
| -rw-r--r-- | source3/smbd/oplock_linux.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 273fbfdc01..b4a5495e4b 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -111,7 +111,7 @@ static bool linux_set_kernel_oplock(struct kernel_oplocks *ctx, if ( SMB_VFS_LINUX_SETLEASE(fsp, F_WRLCK) == -1) { DEBUG(3,("linux_set_kernel_oplock: Refused oplock on file %s, " "fd = %d, file_id = %s. (%s)\n", - fsp->fsp_name, fsp->fh->fd, + fsp_str_dbg(fsp), fsp->fh->fd, file_id_string_tos(&fsp->file_id), strerror(errno))); return False; @@ -119,7 +119,7 @@ static bool linux_set_kernel_oplock(struct kernel_oplocks *ctx, DEBUG(3,("linux_set_kernel_oplock: got kernel oplock on file %s, " "file_id = %s gen_id = %lu\n", - fsp->fsp_name, file_id_string_tos(&fsp->file_id), + fsp_str_dbg(fsp), file_id_string_tos(&fsp->file_id), fsp->fh->gen_id)); return True; @@ -140,7 +140,8 @@ static void linux_release_kernel_oplock(struct kernel_oplocks *ctx, 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_string_tos(&fsp->file_id), + "of %x.\n", fsp_str_dbg(fsp), + file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, state ); } @@ -152,7 +153,7 @@ static void linux_release_kernel_oplock(struct kernel_oplocks *ctx, dbgtext("linux_release_kernel_oplock: Error when " "removing kernel oplock on file " ); dbgtext("%s, file_id = %s, gen_id = %lu. " - "Error was %s\n", fsp->fsp_name, + "Error was %s\n", fsp_str_dbg(fsp), file_id_string_tos(&fsp->file_id), fsp->fh->gen_id, strerror(errno) ); } |