1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00

smbd: oplock: Fixup debug messages inside remove_oplock().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12139

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit de7180151fc99893c4763882fecd9d2a623cd061)
This commit is contained in:
Jeremy Allison 2016-08-10 14:35:42 -07:00 committed by Karolin Seeger
parent 1557d67b81
commit 0cc4822422

View File

@ -233,32 +233,31 @@ bool remove_oplock(files_struct *fsp)
bool ret;
struct share_mode_lock *lck;
DEBUG(10, ("remove_oplock called for %s\n",
fsp_str_dbg(fsp)));
DBG_DEBUG("remove_oplock called for %s\n", fsp_str_dbg(fsp));
/* Remove the oplock flag from the sharemode. */
lck = get_existing_share_mode_lock(talloc_tos(), fsp->file_id);
if (lck == NULL) {
DEBUG(0,("remove_oplock: failed to lock share entry for "
"file %s\n", fsp_str_dbg(fsp)));
return False;
DBG_ERR("failed to lock share entry for "
"file %s\n", fsp_str_dbg(fsp));
return false;
}
ret = remove_share_oplock(lck, fsp);
if (!ret) {
DEBUG(0,("remove_oplock: failed to remove share oplock for "
DBG_ERR("failed to remove share oplock for "
"file %s, %s, %s\n",
fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
file_id_string_tos(&fsp->file_id)));
file_id_string_tos(&fsp->file_id));
}
release_file_oplock(fsp);
ret = update_num_read_oplocks(fsp, lck);
if (!ret) {
DEBUG(0, ("%s: update_num_read_oplocks failed for "
DBG_ERR("update_num_read_oplocks failed for "
"file %s, %s, %s\n",
__func__, fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
file_id_string_tos(&fsp->file_id)));
fsp_str_dbg(fsp), fsp_fnum_dbg(fsp),
file_id_string_tos(&fsp->file_id));
}
TALLOC_FREE(lck);