sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3 onefs oplocks: Replace static fstring with talloc'd dbg_ctx()

Browse Source
This commit is contained in:
Tim Prouty 2009-07-10 11:50:30 -07:00
parent 12a5db45e2
commit 635e5e7ff0
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source3/smbd/oplock_onefs.c
View File

@ -60,29 +60,29 @@ struct onefs_callback_record {
struct onefs_callback_record *callback_recs; struct onefs_callback_record *callback_recs;
/** /**
* Convert a onefs_callback_record to a string. * Convert a onefs_callback_record to a debug string using the dbg_ctx().
*/ */
static char *onefs_callback_record_str_static(const struct onefs_callback_record *r) const char *onefs_cb_record_str_dbg(const struct onefs_callback_record *r)
{ {
static fstring result; char *result;
if (r == NULL) { if (r == NULL) {
fstrcpy(result, "NULL callback record"); result = talloc_strdup(dbg_ctx(), "NULL callback record");
return result; return result;
} }
switch (r->state) { switch (r->state) {
case ONEFS_OPEN_FILE: case ONEFS_OPEN_FILE:
fstr_sprintf(result, "cb record %llu for file %s", result = talloc_asprintf(dbg_ctx(), "cb record %llu for file "
r->id, r->data.fsp->fsp_name); "%s", r->id, r->data.fsp->fsp_name);
break;
case ONEFS_WAITING_FOR_OPLOCK: case ONEFS_WAITING_FOR_OPLOCK:
fstr_sprintf(result, "cb record %llu for pending mid %d", result = talloc_asprintf(dbg_ctx(), "cb record %llu for "
r->id, (int)r->data.mid); "pending mid %d", r->id,
(int)r->data.mid);
break; break;
default: default:
fstr_sprintf(result, "cb record %llu unknown state %d", result = talloc_asprintf(dbg_ctx(), "cb record %llu unknown "
r->id, r->state); "state %d", r->id, r->state);
break; break;
} }
@ -102,7 +102,7 @@ static void debug_cb_records(const char *fn)
DEBUG(10, ("cb records (%s):\n", fn)); DEBUG(10, ("cb records (%s):\n", fn));
for (rec = callback_recs; rec; rec = rec->next) { for (rec = callback_recs; rec; rec = rec->next) {
DEBUGADD(10, ("%s\n", onefs_callback_record_str_static(rec))); DEBUGADD(10, ("%s\n", onefs_cb_record_dbg_str(rec)));
} }
} }
@ -127,7 +127,7 @@ static struct onefs_callback_record *onefs_find_cb(uint64_t id,
for (rec = callback_recs; rec; rec = rec->next) { for (rec = callback_recs; rec; rec = rec->next) {
if (rec->id == id) { if (rec->id == id) {
DEBUG(10, ("found %s\n", DEBUG(10, ("found %s\n",
onefs_callback_record_str_static(rec))); onefs_cb_record_dbg_str(rec)));
break; break;
} }
} }
@ -139,7 +139,7 @@ static struct onefs_callback_record *onefs_find_cb(uint64_t id,
if (rec->state != expected_state) { if (rec->state != expected_state) {
DEBUG(0, ("Expected cb type %d, got %s", expected_state, DEBUG(0, ("Expected cb type %d, got %s", expected_state,
onefs_callback_record_str_static(rec))); onefs_cb_record_dbg_str(rec)));
SMB_ASSERT(0); SMB_ASSERT(0);
return NULL; return NULL;
} }
@ -413,7 +413,7 @@ static void semlock_available_handler(uint64_t id)
char *msg; char *msg;
if (asprintf(&msg, "Semlock available on an open that wasn't " if (asprintf(&msg, "Semlock available on an open that wasn't "
"deferred: %s\n", "deferred: %s\n",
onefs_callback_record_str_static(cb)) != -1) { onefs_cb_record_dbg_str(cb)) != -1) {
smb_panic(msg); smb_panic(msg);
} }
smb_panic("Semlock available on an open that wasn't " smb_panic("Semlock available on an open that wasn't "
@ -457,7 +457,7 @@ static void semlock_async_failure_handler(uint64_t id)
char *msg; char *msg;
if (asprintf(&msg, "Semlock failure on an open that wasn't " if (asprintf(&msg, "Semlock failure on an open that wasn't "
"deferred: %s\n", "deferred: %s\n",
onefs_callback_record_str_static(cb)) != -1) { onefs_cb_record_dbg_str(cb)) != -1) {
smb_panic(msg); smb_panic(msg);
} }
smb_panic("Semlock failure on an open that wasn't deferred\n"); smb_panic("Semlock failure on an open that wasn't deferred\n");