Patchwork [01/15] qemu-nbd: remove offset argument to nbd_trip

login
register
mail settings
Submitter Paolo Bonzini
Date Oct. 10, 2011, 9:37 a.m.
Message ID <1318239477-31451-2-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/118661/
State New
Headers show

Comments

Paolo Bonzini - Oct. 10, 2011, 9:37 a.m.
The argument is write-only.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 nbd.c      |    8 +++-----
 nbd.h      |    2 +-
 qemu-nbd.c |    3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

Patch

diff --git a/nbd.c b/nbd.c
index 6a96878..a96c109 100644
--- a/nbd.c
+++ b/nbd.c
@@ -585,8 +585,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;
@@ -637,7 +638,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);
 
@@ -686,8 +686,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 61553f4..ebdb2db 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 d8d3e15..e2fe7cf 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -184,7 +184,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";
@@ -462,7 +461,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];