1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00

smbd: Use file_id_str_buf() in share_mode_cleanup_disconnected()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2019-11-09 21:11:38 +01:00 committed by Jeremy Allison
parent 6fe211c85d
commit fea35840b0

View File

@ -1199,13 +1199,13 @@ bool share_mode_cleanup_disconnected(struct file_id fid,
struct share_mode_data *data; struct share_mode_data *data;
bool ret = false; bool ret = false;
TALLOC_CTX *frame = talloc_stackframe(); TALLOC_CTX *frame = talloc_stackframe();
struct file_id_buf idbuf;
bool ok; bool ok;
state.lck = get_existing_share_mode_lock(frame, fid); state.lck = get_existing_share_mode_lock(frame, fid);
if (state.lck == NULL) { if (state.lck == NULL) {
DEBUG(5, ("share_mode_cleanup_disconnected: " DBG_INFO("Could not fetch share mode entry for %s\n",
"Could not fetch share mode entry for %s\n", file_id_str_buf(fid, &idbuf));
file_id_string(frame, &fid)));
goto done; goto done;
} }
data = state.lck->data; data = state.lck->data;
@ -1228,7 +1228,7 @@ bool share_mode_cleanup_disconnected(struct file_id fid,
"with file (file-id='%s', servicepath='%s', " "with file (file-id='%s', servicepath='%s', "
"base_name='%s%s%s') and open_persistent_id %"PRIu64" " "base_name='%s%s%s') and open_persistent_id %"PRIu64" "
"==> do not cleanup\n", "==> do not cleanup\n",
file_id_string(frame, &fid), file_id_str_buf(fid, &idbuf),
data->servicepath, data->servicepath,
data->base_name, data->base_name,
(data->stream_name == NULL) (data->stream_name == NULL)
@ -1244,7 +1244,7 @@ bool share_mode_cleanup_disconnected(struct file_id fid,
"with file (file-id='%s', servicepath='%s', " "with file (file-id='%s', servicepath='%s', "
"base_name='%s%s%s') and open_persistent_id %"PRIu64" " "base_name='%s%s%s') and open_persistent_id %"PRIu64" "
"==> do not cleanup\n", "==> do not cleanup\n",
file_id_string(frame, &fid), file_id_str_buf(fid, &idbuf),
data->servicepath, data->servicepath,
data->base_name, data->base_name,
(data->stream_name == NULL) (data->stream_name == NULL)
@ -1260,7 +1260,7 @@ bool share_mode_cleanup_disconnected(struct file_id fid,
"base_name='%s%s%s') " "base_name='%s%s%s') "
"from open_persistent_id %"PRIu64"\n", "from open_persistent_id %"PRIu64"\n",
data->num_share_modes, data->num_share_modes,
file_id_string(frame, &fid), file_id_str_buf(fid, &idbuf),
data->servicepath, data->servicepath,
data->base_name, data->base_name,
(data->stream_name == NULL) (data->stream_name == NULL)