diff options
| author | Volker Lendecke <vl@samba.org> | 2015-04-28 11:30:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-04-28 20:48:01 +0200 |
| commit | 06f4ba321761d6fdfb4a722849da6a11f6779a0a (patch) | |
| tree | e1f65152b88b5d6d4b896e9cd5880cb95070bdf4 /source3/locking | |
| parent | b2c34d45c0b16a8e7acff864b8c5fdca9f38d20d (diff) | |
| download | samba-06f4ba321761d6fdfb4a722849da6a11f6779a0a.tar.gz | |
lib: Remove server_id_str()
Call server_id_str_buf instead
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Apr 28 20:48:01 CEST 2015 on sn-devel-104
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 7 | ||||
| -rw-r--r-- | source3/locking/share_mode_lock.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 5dee91c96c4..0738464163a 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -58,11 +58,13 @@ struct byte_range_lock { static void print_lock_struct(unsigned int i, const struct lock_struct *pls) { + struct server_id_buf tmp; + DEBUG(10,("[%u]: smblctx = %llu, tid = %u, pid = %s, ", i, (unsigned long long)pls->context.smblctx, (unsigned int)pls->context.tid, - server_id_str(talloc_tos(), &pls->context.pid) )); + server_id_str_buf(pls->context.pid, &tmp) )); DEBUG(10, ("start = %ju, size = %ju, fnum = %ju, %s %s\n", (uintmax_t)pls->start, @@ -2243,10 +2245,11 @@ bool brl_cleanup_disconnected(struct file_id fid, uint64_t open_persistent_id) struct lock_context *ctx = &lock[n].context; if (!server_id_is_disconnected(&ctx->pid)) { + struct server_id_buf tmp; DEBUG(5, ("brl_cleanup_disconnected: byte range lock " "%s used by server %s, do not cleanup\n", file_id_string(frame, &fid), - server_id_str(frame, &ctx->pid))); + server_id_str_buf(ctx->pid, &tmp))); goto done; } diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 79efb70ccc6..5eedcc5fbe4 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -792,6 +792,7 @@ bool share_mode_cleanup_disconnected(struct file_id fid, struct share_mode_entry *entry = &data->share_modes[n]; if (!server_id_is_disconnected(&entry->pid)) { + struct server_id_buf tmp; DEBUG(5, ("share_mode_cleanup_disconnected: " "file (file-id='%s', servicepath='%s', " "base_name='%s%s%s') " @@ -803,7 +804,7 @@ bool share_mode_cleanup_disconnected(struct file_id fid, ? "" : "', stream_name='", (data->stream_name == NULL) ? "" : data->stream_name, - server_id_str(frame, &entry->pid))); + server_id_str_buf(entry->pid, &tmp))); goto done; } if (open_persistent_id != entry->share_file_id) { |