Re: [Nbd] [PATCH] doc: Fix some minor issues

[Wouter Verhelst <w@...112...>]

On Thu, Feb 16, 2017 at 05:04:52PM -0600, Eric Blake wrote:
> Fix a grammar nit, and resolve a conflict between two extensions
> picking the same command number (BLOCK_STATUS is the older proposal,
> so it keeps command 7, RESIZE gets command 8).

Thanks, applied (all three).

Sorry it took so long, I've been sick.

Unfortunately none of these commits made it into 3.15.2 either, but that's for
next time.

> Signed-off-by: Eric Blake <eblake@...696...>
> ---
> 
> To be applied on the master branch. The extension-resize branch will
> also need patching.
> 
>  doc/proto.md | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/proto.md b/doc/proto.md
> index 39391a5..79117b5 100644
> --- a/doc/proto.md
> +++ b/doc/proto.md
> @@ -287,7 +287,7 @@ order, except that:
> 
>  * All write commands (that includes `NBD_CMD_WRITE`,
>    `NBD_CMD_WRITE_ZEROES` and `NBD_CMD_TRIM`) that the server
> -  completes (i.e. replies to) prior to processing to a
> +  completes (i.e. replies to) prior to processing a
>    `NBD_CMD_FLUSH` MUST be written to non-volatile
>    storage prior to replying to that `NBD_CMD_FLUSH`. This
>    paragraph only applies if `NBD_FLAG_SEND_FLUSH` is set within
> @@ -991,7 +991,12 @@ The following request types exist:
>      including one or more sectors beyond the size of the device. It SHOULD
>      return `EPERM` if it receives a write zeroes request on a read-only export.
> 
> -* `NBD_CMD_RESIZE` (7)
> +* `NBD_CMD_BLOCK_STATUS` (7)
> +
> +    Defined by the experimental `BLOCK_STATUS`
> +    [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-blockstatus/doc/proto.md).
> +
> +* `NBD_CMD_RESIZE` (8)
> 
>      Defined by the experimental `RESIZE`
>      [extension](https://github.com/NetworkBlockDevice/nbd/blob/extension-resize/doc/proto.md).
> -- 
> 2.9.3
> 
> 
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> Nbd-general mailing list
> Nbd-general@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/nbd-general
> 

-- 
< ron> I mean, the main *practical* problem with C++, is there's like a dozen
       people in the world who think they really understand all of its rules,
       and pretty much all of them are just lying to themselves too.
 -- #debian-devel, OFTC, 2016-02-12