diff --git a/nbd.c b/nbd.c index 73fedeb9ad..1df2b91bf2 100644 --- a/nbd.c +++ b/nbd.c @@ -583,8 +583,9 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply) return 0; } -int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size) +int nbd_trip(BlockDriverState *bs, int csock, off_t size, + uint64_t dev_offset, uint32_t nbdflags, + uint8_t *data, int data_size) { struct nbd_request request; struct nbd_reply reply; @@ -635,7 +636,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, reply.error = -ret; request.len = 0; } - *offset += request.len; TRACE("Read %u byte(s)", request.len); @@ -684,8 +684,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, request.len = 0; } - *offset += request.len; - if (request.type & NBD_CMD_FLAG_FUA) { ret = bdrv_flush(bs); if (ret < 0) { diff --git a/nbd.h b/nbd.h index 61553f4128..ebdb2dbf41 100644 --- a/nbd.h +++ b/nbd.h @@ -72,7 +72,7 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize); int nbd_send_request(int csock, struct nbd_request *request); int nbd_receive_reply(int csock, struct nbd_reply *reply); int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size); + uint32_t nbdflags, uint8_t *data, int data_size); int nbd_client(int fd); int nbd_disconnect(int fd); diff --git a/qemu-nbd.c b/qemu-nbd.c index 291cba2eaa..f9ee9c58d1 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -248,7 +248,6 @@ int main(int argc, char **argv) { BlockDriverState *bs; off_t dev_offset = 0; - off_t offset = 0; uint32_t nbdflags = 0; bool disconnect = false; const char *bindto = "0.0.0.0"; @@ -542,7 +541,7 @@ int main(int argc, char **argv) for (i = 1; i < nb_fds && ret; i++) { if (FD_ISSET(sharing_fds[i], &fds)) { if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset, - &offset, nbdflags, data, NBD_BUFFER_SIZE) != 0) { + nbdflags, data, NBD_BUFFER_SIZE) != 0) { close(sharing_fds[i]); nb_fds--; sharing_fds[i] = sharing_fds[nb_fds];