diff options
| author | Volker Lendecke <vl@samba.org> | 2019-11-04 07:39:48 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-11-06 20:36:35 +0000 |
| commit | 75962acade60530ff99663ffbc1ca9d0eb79ccc0 (patch) | |
| tree | 1c1ea6e46f5a939a642346008eb147ce69029f02 | |
| parent | 6e521461c5d57ddf01904e75b80602d662da9057 (diff) | |
| download | samba-75962acade60530ff99663ffbc1ca9d0eb79ccc0.tar.gz | |
smbd: Use file_id_str_buf() in initial_break_processing()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/oplock.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 97b1731584e..b073c0d04ca 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -744,12 +744,14 @@ static files_struct *initial_break_processing( unsigned long file_id) { files_struct *fsp = NULL; + struct file_id_buf idbuf; - DEBUG(3, ("initial_break_processing: called for %s/%u\n" - "Current oplocks_open (exclusive = %d, levelII = %d)\n", - file_id_string_tos(&id), (int)file_id, - sconn->oplocks.exclusive_open, - sconn->oplocks.level_II_open)); + DBG_NOTICE("called for %s/%u\n" + "Current oplocks_open (exclusive = %d, levelII = %d)\n", + file_id_str_buf(id, &idbuf), + (int)file_id, + sconn->oplocks.exclusive_open, + sconn->oplocks.level_II_open); /* * We need to search the file open table for the @@ -761,9 +763,11 @@ static files_struct *initial_break_processing( if(fsp == NULL) { /* The file could have been closed in the meantime - return success. */ - DEBUG(3, ("initial_break_processing: cannot find open file " - "with file_id %s gen_id = %lu, allowing break to " - "succeed.\n", file_id_string_tos(&id), file_id)); + DBG_NOTICE("cannot find open file " + "with file_id %s gen_id = %lu, allowing break to " + "succeed.\n", + file_id_str_buf(id, &idbuf), + file_id); return NULL; } @@ -782,7 +786,7 @@ static files_struct *initial_break_processing( "has no oplock. " "Allowing break to succeed regardless.\n", fsp_str_dbg(fsp), - file_id_string_tos(&id), + file_id_str_buf(id, &idbuf), fsp->fh->gen_id); return NULL; } |