lesderid
/
buse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8 from rutsky/make-buse_operations-optional 

make buse_operations fields optional
This commit is contained in:
Adam Cozzette 2016-02-08 21:58:56 -08:00
parent 48c8f20d92 688038b583
commit 83b24c843e
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
buse.c
View File

@ -145,6 +145,7 @@ int buse_main(const char* dev_file, const struct buse_operations *aop, void *use
while ((bytes_read = read(sk, &request, sizeof(request))) > 0) { while ((bytes_read = read(sk, &request, sizeof(request))) > 0) {
assert(bytes_read == sizeof(request)); assert(bytes_read == sizeof(request));
memcpy(reply.handle, request.handle, sizeof(reply.handle)); memcpy(reply.handle, request.handle, sizeof(reply.handle));
reply.error = htonl(0);
len = ntohl(request.len); len = ntohl(request.len);
from = ntohll(request.from); from = ntohll(request.from);
@ -158,39 +159,51 @@ int buse_main(const char* dev_file, const struct buse_operations *aop, void *use
*/ */
case NBD_CMD_READ: case NBD_CMD_READ:
fprintf(stderr, "Request for read of size %d\n", len); fprintf(stderr, "Request for read of size %d\n", len);
assert(aop->read); /* Fill with zero in case actual read is not implemented */
chunk = malloc(len); chunk = malloc(len);
if (aop->read) {
reply.error = aop->read(chunk, len, from, userdata); reply.error = aop->read(chunk, len, from, userdata);
} else {
/* If user not specified read operation, return EPERM error */
reply.error = htonl(EPERM);
}
write_all(sk, (char*)&reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
if(reply.error == 0)
write_all(sk, (char*)chunk, len); write_all(sk, (char*)chunk, len);
free(chunk); free(chunk);
break; break;
case NBD_CMD_WRITE: case NBD_CMD_WRITE:
fprintf(stderr, "Request for write of size %d\n", len); fprintf(stderr, "Request for write of size %d\n", len);
assert(aop->write);
chunk = malloc(len); chunk = malloc(len);
read_all(sk, chunk, len); read_all(sk, chunk, len);
if (aop->write) {
reply.error = aop->write(chunk, len, from, userdata); reply.error = aop->write(chunk, len, from, userdata);
} else {
/* If user not specified write operation, return EPERM error */
reply.error = htonl(EPERM);
}
free(chunk); free(chunk);
write_all(sk, (char*)&reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
case NBD_CMD_DISC: case NBD_CMD_DISC:
/* Handle a disconnect request. */ /* Handle a disconnect request. */
assert(aop->disc); if (aop->disc) {
aop->disc(userdata); aop->disc(userdata);
}
return 0; return 0;
#ifdef NBD_FLAG_SEND_FLUSH #ifdef NBD_FLAG_SEND_FLUSH
case NBD_CMD_FLUSH: case NBD_CMD_FLUSH:
assert(aop->flush); if (aop->flush) {
reply.error = aop->flush(userdata); reply.error = aop->flush(userdata);
}
write_all(sk, (char*)&reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
#endif #endif
#ifdef NBD_FLAG_SEND_TRIM #ifdef NBD_FLAG_SEND_TRIM
case NBD_CMD_TRIM: case NBD_CMD_TRIM:
assert(aop->trim); if (aop->trim) {
reply.error = aop->trim(from, len, userdata); reply.error = aop->trim(from, len, userdata);
}
write_all(sk, (char*)&reply, sizeof(struct nbd_reply)); write_all(sk, (char*)&reply, sizeof(struct nbd_reply));
break; break;
#endif #endif