haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nbd/server: fix trace

Browse source 
Return code = 1 doesn't mean that we parsed base:allocation. Use
correct traces in both -parsed and -skipped cases.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20180609151758.17343-2-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: comment tweaks]
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-06-09 18:17:53 +03:00 committed by Eric Blake
parent d8b20291cb
commit dbb8b396bb
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nbd/server.c
View file

@ -736,12 +736,16 @@ static int nbd_negotiate_send_meta_context(NBDClient *client,
/* nbd_meta_base_query /* nbd_meta_base_query
* *
* Handle query to 'base' namespace. For now, only base:allocation context is * Handle queries to 'base' namespace. For now, only the base:allocation
* available in it. 'len' is the amount of text remaining to be read from * context is available. 'len' is the amount of text remaining to be read from
* the current name, after the 'base:' portion has been stripped. * the current name, after the 'base:' portion has been stripped.
* *
* Return -errno on I/O error, 0 if option was completely handled by * Return -errno on I/O error, 0 if option was completely handled by
* sending a reply about inconsistent lengths, or 1 on success. */ * sending a reply about inconsistent lengths, or 1 on success.
*
* Note: return code = 1 doesn't mean that we've parsed the "base:allocation"
* namespace. It only means that there are no errors.
*/
static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta,
uint32_t len, Error **errp) uint32_t len, Error **errp)
{ {
@ -768,10 +772,12 @@ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta,
} }
if (strncmp(query, "allocation", alen) == 0) { if (strncmp(query, "allocation", alen) == 0) {
trace_nbd_negotiate_meta_query_parse("base:allocation");
meta->base_allocation = true; meta->base_allocation = true;
} else {
trace_nbd_negotiate_meta_query_skip("not base:allocation");
} }
trace_nbd_negotiate_meta_query_parse("base:allocation");
return 1; return 1;
} }