nbd/server: fix trace
PATCH 1/1 nbd/server: fix trace
Return code = 1 doesn't mean that we parsed base:allocation. Move trace point to appropriate place.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
--- nbd/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
nbd/server.c +5 -2
@@ -741,7 +741,10 @@ static int nbd_negotiate_send_meta_context(NBDClient *client,* the current name, after the 'base:' portion has been stripped. * * 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 "base:allocation" +* namespace. It only mean that there are no errors.*/ static int nbd_meta_base_query (NBDClient *client,NBDExportMetaContexts *meta,uint32_t len,Error **errp) {
@@ -768,10 +771,10 @@ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, }if (strncmp (query,"allocation" , alen) ==0 ) { +trace_nbd_negotiate_meta_query_parse ("base:allocation" ); meta->base_allocation = true; } -trace_nbd_negotiate_meta_query_parse ("base:allocation" );return 1 ; }
Signature · 1 line
2.11.1
will resend with "NBD export bitmaps" series v3
Quoted 36 lines · Vladimir Sementsov-Ogievskiy
Return code = 1 doesn't mean that we parsed base:allocation. Move trace point to appropriate place.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- nbd/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)nbd/server.c +5
-2@@ -741,7 +741,10 @@ static int nbd_negotiate_send_meta_context(NBDClient *client,* the current name, after the 'base:' portion has been stripped. * * 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 "base:allocation" +* namespace. It only mean that there are no errors.*/ static int nbd_meta_base_query (NBDClient *client,NBDExportMetaContexts *meta,uint32_t len,Error **errp) {@@ -768,10 +771,10 @@ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *meta, }if (strncmp (query,"allocation" , alen) ==0 ) { +trace_nbd_negotiate_meta_query_parse ("base:allocation" ); meta->base_allocation = true; } -trace_nbd_negotiate_meta_query_parse ("base:allocation" );return 1 ; }
Signature · 2 lines
Best regards, Vladimir