[Qemu-commits] [qemu/qemu] 915624: nbd/server: add additional assert to nbd_export_pu...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9156245ec49b36d934ed09d49ffbd5dd37285374
      
https://github.com/qemu/qemu/commit/9156245ec49b36d934ed09d49ffbd5dd37285374
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M nbd/server.c

  Log Message:
  -----------
  nbd/server: add additional assert to nbd_export_put

This place is not obvious, nbd_export_close may theoretically reduce
refcount to 0. It may happen if someone calls nbd_export_put on named
export not through nbd_export_set_name when refcount is 1.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 420a4e955909788263a33d11600839e93480dfd3
      
https://github.com/qemu/qemu/commit/420a4e955909788263a33d11600839e93480dfd3
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2018-01-10 (Wed, 10 Jan 2018)

  Changed paths:
    M include/block/nbd.h
    M nbd/client.c

  Log Message:
  -----------
  nbd: rename nbd_option and nbd_opt_reply

Rename nbd_option and nbd_opt_reply to NBDOption and NBDOptionReply
to correspond to Qemu coding style and other structures here.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 612061b277915fadd80631eb7a6926f48a110c44
      
https://github.com/qemu/qemu/commit/612061b277915fadd80631eb7a6926f48a110c44
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-11 (Thu, 11 Jan 2018)

  Changed paths:
    M include/block/nbd.h
    M nbd/client.c
    M nbd/server.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-10' into 
staging

nbd patches for 2018-01-10

- Vladimir Sementsov-Ogievskiy: nbd: rename nbd_option and nbd_opt_reply
- Vladimir Sementsov-Ogievskiy: nbd/server: add additional assert to 
nbd_export_put

# gpg: Signature made Wed 10 Jan 2018 22:53:49 GMT
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>"
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2018-01-10:
  nbd: rename nbd_option and nbd_opt_reply
  nbd/server: add additional assert to nbd_export_put

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/7642f96e6015...612061b27791