Merge branch 'master' of https://github.com/comatose/BUSE

Conflicts:
	buse.c
	buse.h
	busexmp.c

buse.c

@@ -31,14 +31,14 @@ u_int64_t ntohll(u_int64_t a) {
 #endif
 #define htonll ntohll
 
-static int read_all(int fd, void *buf, size_t count)
+static int read_all(int fd, char* buf, size_t count)
 {
   int bytes_read;
 
   while (count > 0) {
     bytes_read = read(fd, buf, count);
     assert(bytes_read > 0);
-        buf = (char *)buf + bytes_read;
+    buf += bytes_read;
     count -= bytes_read;
   }
   assert(count == 0);
@@ -46,14 +46,14 @@ static int read_all(int fd, void *buf, size_t count)
   return 0;
 }
 
-static int write_all(int fd, const void *buf, size_t count)
+static int write_all(int fd, char* buf, size_t count)
 {
   int bytes_written;
 
   while (count > 0) {
     bytes_written = write(fd, buf, count);
     assert(bytes_written > 0);
-        buf = (char *)buf + bytes_written;
+    buf += bytes_written;
     count -= bytes_written;
   }
   assert(count == 0);
@@ -90,15 +90,21 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
     close(sp[0]);
     sk = sp[1];
 
-        assert(ioctl(nbd, NBD_SET_SOCK, sk) != -1);
+    if(ioctl(nbd, NBD_SET_SOCK, sk) == -1){
-	assert(ioctl(nbd, NBD_SET_FLAGS, NBD_FLAG_SEND_TRIM) != -1);
+      fprintf(stderr, "ioctl(nbd, NBD_SET_SOCK, sk) failed.[%s]\n", strerror(errno));
+    }
+    else if(ioctl(nbd, NBD_SET_FLAGS, NBD_FLAG_SEND_TRIM) == -1){
+      fprintf(stderr, "ioctl(nbd, NBD_SET_FLAGS, NBD_FLAG_SEND_TRIM) failed.[%s]\n", strerror(errno));
+    }
+    else{
       err = ioctl(nbd, NBD_DO_IT);
       fprintf(stderr, "nbd device terminated with code %d\n", err);
       if (err == -1)
 	fprintf(stderr, "%s\n", strerror(errno));
+    }
 
-        assert(ioctl(nbd, NBD_CLEAR_QUE) != -1);
+    ioctl(nbd, NBD_CLEAR_QUE);
-        assert(ioctl(nbd, NBD_CLEAR_SOCK) != -1);
+    ioctl(nbd, NBD_CLEAR_SOCK);
 
     exit(0);
   }
@@ -117,8 +123,7 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
   reply.magic = htonl(NBD_REPLY_MAGIC);
   reply.error = htonl(0);
 
-    while (1) {
+  while ((bytes_read = read(sk, &request, sizeof(request))) > 0) {
-        bytes_read = read(sk, &request, sizeof(request));
     assert(bytes_read == sizeof(request));
     memcpy(reply.handle, request.handle, sizeof(reply.handle));
 
@@ -135,33 +140,37 @@ int buse_main(int argc, char *argv[], const struct buse_operations *aop, void *u
     case NBD_CMD_READ:
       /* fprintf(stderr, "Request for read of size %d\n", len); */
       chunk = malloc(len + sizeof(struct nbd_reply));
-                aop->read((char *)chunk + sizeof(struct nbd_reply), len, from);
+      reply.error = aop->read((char *)chunk + sizeof(struct nbd_reply), len, from);
-                memcpy(chunk, &reply, sizeof(struct nbd_reply));
+      write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
-                write_all(sk, chunk, len + sizeof(struct nbd_reply));
+      if(reply.error == 0)
+	write_all(sk, (char*)chunk, len);
       free(chunk);
       break;
     case NBD_CMD_WRITE:
       /* fprintf(stderr, "Request for write of size %d\n", len); */
       chunk = malloc(len);
       read_all(sk, chunk, len);
-                aop->write(chunk, len, from);
+      reply.error = aop->write(chunk, len, from);
       free(chunk);
-                write_all(sk, &reply, sizeof(struct nbd_reply));
+      write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
       break;
     case NBD_CMD_DISC:
       /* Handle a disconnect request. */
       aop->disc();
       return 0;
     case NBD_CMD_FLUSH:
-                aop->flush();
+      reply.error = aop->flush();
+      write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
       break;
     case NBD_CMD_TRIM:
-                aop->trim(from, len);
+      reply.error = aop->trim(from, len);
+      write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
       break;
     default:
       assert(0);
     }
   }
-
+  if (bytes_read == -1)
+    fprintf(stderr, "%s\n", strerror(errno));
   return 0;
 }

buse.h

@@ -63,7 +63,7 @@ struct nbd_reply {
 struct buse_operations {
     int (*read)(void *buf, u_int32_t len, u_int64_t offset);
     int (*write)(const void *buf, u_int32_t len, u_int64_t offset);
-    int (*disc)();
+    void (*disc)();
     int (*flush)();
     int (*trim)(u_int64_t from, u_int32_t len);
 

busexmp.c

@@ -20,9 +20,20 @@ static int xmp_write(const void *buf, u_int32_t len, u_int64_t offset)
   return 0;
 }
 
-static int xmp_disc()
+static void xmp_disc()
 {
   fprintf(stderr, "Received a disconnect request.\n");
+}
+
+static int xmp_flush()
+{
+  fprintf(stderr, "Received a flush request.\n");
+  return 0;
+}
+
+static int xmp_trim(u_int64_t from, u_int32_t len)
+{
+  fprintf(stderr, "T %lu %u\n", from, len);
   return 0;
 }
 
@@ -41,8 +52,8 @@ static struct buse_operations aop = {
   .read = xmp_read,
   .write = xmp_write,
   .disc = xmp_disc,
-  .trim = xmp_trim,
   .flush = xmp_flush,
+  .trim = xmp_trim,
   .size = 128 * 1024 * 1024,
 };