← Back to branch summary

~ubuntu-branches/debian/experimental/linux-tools/experimental

« back to all changes in this revision

Viewing changes to tools/hv/hv_vss_daemon.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings
  • Date: 2014-02-02 16:57:49 UTC
  • mfrom: (1.1.10) (0.1.21 sid)
  • Revision ID: package-import@ubuntu.com-20140202165749-tw94o9t1t0a8txk6
Tags: 3.13-1~exp2
Merge changes from sid up to 3.12.6-3

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/hv/hv_vss_daemon.c
140
140
        struct cn_msg   *incoming_cn_msg;
141
141
        int     op;
142
142
        struct hv_vss_msg *vss_msg;
143
 
        char *vss_send_buffer;
144
143
        char *vss_recv_buffer;
145
144
        size_t vss_recv_buffer_len;
146
145
 
150
149
        openlog("Hyper-V VSS", 0, LOG_USER);
151
150
        syslog(LOG_INFO, "VSS starting; pid is:%d", getpid());
152
151
 
153
 
        vss_recv_buffer_len = NLMSG_HDRLEN + sizeof(struct cn_msg) + sizeof(struct hv_vss_msg);
154
 
        vss_send_buffer = calloc(1, vss_recv_buffer_len);
 
152
        vss_recv_buffer_len = NLMSG_LENGTH(0) + sizeof(struct cn_msg) + sizeof(struct hv_vss_msg);
155
153
        vss_recv_buffer = calloc(1, vss_recv_buffer_len);
156
 
        if (!(vss_send_buffer && vss_recv_buffer)) {
 
154
        if (!vss_recv_buffer) {
157
155
                syslog(LOG_ERR, "Failed to allocate netlink buffers");
158
156
                exit(EXIT_FAILURE);
159
157
        }
185
183
        /*
186
184
         * Register ourselves with the kernel.
187
185
         */
188
 
        message = (struct cn_msg *)vss_send_buffer;
 
186
        message = (struct cn_msg *)vss_recv_buffer;
189
187
        message->id.idx = CN_VSS_IDX;
190
188
        message->id.val = CN_VSS_VAL;
191
189
        message->ack = 0;