Commit ba845644 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

nbd/client: refactor nbd_receive_reply 



Refactor nbd_receive_reply to return 1 on success, 0 on eof, when no
data was read and <0 for other cases, because returned size of read
data is not actually used.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20170804151440.320927-4-vsementsov@virtuozzo.com>
[eblake: tweak function comments]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent ab01df1f

include/block/nbd.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name, 
int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,

             Error **errp);

ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request);

ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);

int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);

int nbd_client(int fd);

int nbd_disconnect(int fd);

nbd/client.c

+9 −3
Original line number Diff line number Diff line
@@ -914,11 +914,16 @@ ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request) 
    return nbd_write(ioc, buf, sizeof(buf), NULL);

}



ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)

/* nbd_receive_reply

 * Returns 1 on success

 *         0 on eof, when no data was read (errp is not set)

 *         negative errno on failure (errp is set)

 */

int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)

{

    uint8_t buf[NBD_REPLY_SIZE];

    uint32_t magic;

    ssize_t ret;

    int ret;



    ret = nbd_read_eof(ioc, buf, sizeof(buf), errp);

    if (ret <= 0) {
@@ -948,6 +953,7 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp) 
        error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic);

        return -EINVAL;

    }

    return sizeof(buf);



    return 1;

}