projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iolog: fix --bandwidth-log segfaults
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index 38626998f279467695fbb27d161ada37f5adbedd..091c1613662f66b3eec6f609ab782304a4ecc097 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-578,8
+578,12
@@
static int fio_net_queue_cmd(uint16_t opcode, void *buf, off_t size,
struct sk_entry *entry;
entry = fio_net_prep_cmd(opcode, buf, size, tagptr, flags);
struct sk_entry *entry;
entry = fio_net_prep_cmd(opcode, buf, size, tagptr, flags);
- fio_net_queue_entry(entry);
- return 0;
+ if (entry) {
+ fio_net_queue_entry(entry);
+ return 0;
+ }
+
+ return 1;
}
static int fio_net_send_simple_stack_cmd(int sk, uint16_t opcode, uint64_t tag)
}
static int fio_net_send_simple_stack_cmd(int sk, uint16_t opcode, uint64_t tag)
@@
-1999,10
+2003,8
@@
int fio_server_get_verify_state(const char *name, int threadnumber,
dprint(FD_NET, "server: request verify state\n");
rep = smalloc(sizeof(*rep));
dprint(FD_NET, "server: request verify state\n");
rep = smalloc(sizeof(*rep));
- if (!rep) {
- log_err("fio: smalloc pool too small\n");
+ if (!rep)
return ENOMEM;
return ENOMEM;
- }
__fio_mutex_init(&rep->lock, FIO_MUTEX_LOCKED);
rep->data = NULL;
__fio_mutex_init(&rep->lock, FIO_MUTEX_LOCKED);
rep->data = NULL;