diff options
author | Mattias Andrée <maandree@operamail.com> | 2014-05-03 20:23:39 +0200 |
---|---|---|
committer | Mattias Andrée <maandree@operamail.com> | 2014-05-03 20:23:39 +0200 |
commit | 6cb00072ac1b8ca8e4504f2aeb55136a3b456447 (patch) | |
tree | f6d3048931ea3a8e0735d5e40a799a5d6e7c7d96 | |
parent | more re-exec stuff (diff) | |
download | mds-6cb00072ac1b8ca8e4504f2aeb55136a3b456447.tar.gz mds-6cb00072ac1b8ca8e4504f2aeb55136a3b456447.tar.bz2 mds-6cb00072ac1b8ca8e4504f2aeb55136a3b456447.tar.xz |
no need to marshal the socket's fd, it is already included in the cmdline
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r-- | src/mds-server.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mds-server.c b/src/mds-server.c index 4438397..8c8348a 100644 --- a/src/mds-server.c +++ b/src/mds-server.c @@ -367,15 +367,14 @@ int main(int argc_, char** argv_) message = ((client_t*)(void*)(client_list.values[node]))->message; msg_size += mds_message_marshal_size(&message, 1); } - state_n = sizeof(ssize_t) + 2 * sizeof(int) + 2 * sizeof(size_t); + state_n = sizeof(ssize_t) + 1 * sizeof(int) + 2 * sizeof(size_t); state_n *= list_elements; state_n += msg_size; state_n += 2 * sizeof(int) + 1 * sizeof(sig_atomic_t) + 3 * sizeof(size_t); state_buf = malloc(state_n); state_buf_ = state_buf; ((int*)state_buf_)[0] = MDS_SERVER_VARS_VERSION; - ((int*)state_buf_)[1] = socket_fd; - state_buf_ += 2 * sizeof(int) / sizeof(char); + state_buf_ += 1 * sizeof(int) / sizeof(char); ((sig_atomic_t*)state_buf_)[0] = running; state_buf_ += 1 * sizeof(sig_atomic_t) / sizeof(char); ((size_t*)state_buf_)[0] = list_size; |