From 9eb7072f4984927a07f7621db3e3e05b611e7dc4 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Fri, 2 Feb 2018 20:46:25 +0000 Subject: [PATCH] Removed some extra spaces I'd added --- src/common/nbdtypes.h | 6 +++--- src/common/readwrite.c | 2 +- src/proxy/proxy.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/nbdtypes.h b/src/common/nbdtypes.h index 0557c44..5d5b614 100644 --- a/src/common/nbdtypes.h +++ b/src/common/nbdtypes.h @@ -19,7 +19,7 @@ #define FLAG_SEND_FUA (1 << 3) /* Send FUA (Force Unit Access) */ /* values for command flag field */ -#define CMD_FLAG_FUA (1 << 0) +#define CMD_FLAG_FUA (1 << 0) #if 0 /* Not yet implemented by flexnbd */ @@ -67,7 +67,7 @@ struct nbd_init_raw { struct nbd_request_raw { __be32 magic; - __be16 flags; + __be16 flags; __be16 type; /* == READ || == WRITE || == FLUSH */ nbd_handle_t handle; __be64 from; @@ -90,7 +90,7 @@ struct nbd_init { struct nbd_request { uint32_t magic; - uint16_t flags; + uint16_t flags; uint16_t type; /* == READ || == WRITE || == DISCONNECT || == FLUSH */ nbd_handle_t handle; uint64_t from; diff --git a/src/common/readwrite.c b/src/common/readwrite.c index cae4ffa..03bcb13 100644 --- a/src/common/readwrite.c +++ b/src/common/readwrite.c @@ -55,7 +55,7 @@ int nbd_check_hello( struct nbd_init_raw* init_raw, uint64_t* out_size, uint32_t if ( NULL != out_size ) { *out_size = be64toh( init_raw->size ); } - + if ( NULL != out_flags ) { *out_flags = be32toh( init_raw->flags ); } diff --git a/src/proxy/proxy.c b/src/proxy/proxy.c index 78726ca..bacffee 100644 --- a/src/proxy/proxy.c +++ b/src/proxy/proxy.c @@ -204,7 +204,7 @@ void proxy_finish_connect_to_upstream( struct proxier *proxy, uint64_t size, uin } proxy->upstream_size = size; - + if ( proxy->upstream_flags == 0 ) { info( "Upstream transmission flags set to %"PRIu32"", flags ); } else if ( proxy->upstream_flags != flags ) {