Skip to content
  • Eric Blake's avatar
    3fa4c765
    nbd: Merge nbd_export_set_name into nbd_export_new · 3fa4c765
    Eric Blake authored
    
    
    The existing NBD code had a weird split where nbd_export_new()
    created an export but did not add it to the list of exported
    names until a later nbd_export_set_name() came along and grabbed
    a second reference on the object; later, the first call to
    nbd_export_close() drops the second reference while removing
    the export from the list.  This is in part because the QAPI
    NbdServerRemoveNode enum documents the possibility of adding a
    mode where we could do a soft disconnect: preventing new clients,
    but waiting for existing clients to gracefully quit, based on
    the mode used when calling nbd_export_close().
    
    But in spite of all that, note that we never change the name of
    an NBD export while it is exposed, which means it is easier to
    just inline the process of setting the name as part of creating
    the export.
    
    Inline the contents of nbd_export_set_name() and
    nbd_export_set_description() into the two points in an export
    lifecycle where they matter, then adjust both callers to pass
    the name up front.  Note that for creation, all callers pass a
    non-NULL name, (passing NULL at creation was for old style
    servers, but we removed support for that in commit 7f7dfe2a),
    so we can add an assert and do things unconditionally; but for
    cleanup, because of the dual nature of nbd_export_close(), we
    still have to be careful to avoid use-after-free.  Along the
    way, add a comment reminding ourselves of the potential of
    adding a middle mode disconnect.
    
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>
    Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    Message-Id: <20190111194720.15671-5-eblake@redhat.com>
    3fa4c765
    nbd: Merge nbd_export_set_name into nbd_export_new
    Eric Blake authored
    
    
    The existing NBD code had a weird split where nbd_export_new()
    created an export but did not add it to the list of exported
    names until a later nbd_export_set_name() came along and grabbed
    a second reference on the object; later, the first call to
    nbd_export_close() drops the second reference while removing
    the export from the list.  This is in part because the QAPI
    NbdServerRemoveNode enum documents the possibility of adding a
    mode where we could do a soft disconnect: preventing new clients,
    but waiting for existing clients to gracefully quit, based on
    the mode used when calling nbd_export_close().
    
    But in spite of all that, note that we never change the name of
    an NBD export while it is exposed, which means it is easier to
    just inline the process of setting the name as part of creating
    the export.
    
    Inline the contents of nbd_export_set_name() and
    nbd_export_set_description() into the two points in an export
    lifecycle where they matter, then adjust both callers to pass
    the name up front.  Note that for creation, all callers pass a
    non-NULL name, (passing NULL at creation was for old style
    servers, but we removed support for that in commit 7f7dfe2a),
    so we can add an assert and do things unconditionally; but for
    cleanup, because of the dual nature of nbd_export_close(), we
    still have to be careful to avoid use-after-free.  Along the
    way, add a comment reminding ourselves of the potential of
    adding a middle mode disconnect.
    
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>
    Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
    Message-Id: <20190111194720.15671-5-eblake@redhat.com>
Loading