aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_nl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
-rw-r--r--drivers/block/drbd/drbd_nl.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index cfde31002dff..73c55ccb629a 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -33,7 +33,6 @@
33#include <linux/blkpg.h> 33#include <linux/blkpg.h>
34#include <linux/cpumask.h> 34#include <linux/cpumask.h>
35#include "drbd_int.h" 35#include "drbd_int.h"
36#include "drbd_tracing.h"
37#include "drbd_wrappers.h" 36#include "drbd_wrappers.h"
38#include <asm/unaligned.h> 37#include <asm/unaligned.h>
39#include <linux/drbd_tag_magic.h> 38#include <linux/drbd_tag_magic.h>
@@ -2024,8 +2023,6 @@ static void drbd_connector_callback(struct cn_msg *req)
2024 goto fail; 2023 goto fail;
2025 } 2024 }
2026 2025
2027 trace_drbd_netlink(req, 1);
2028
2029 if (nlp->packet_type >= P_nl_after_last_packet) { 2026 if (nlp->packet_type >= P_nl_after_last_packet) {
2030 retcode = ERR_PACKET_NR; 2027 retcode = ERR_PACKET_NR;
2031 goto fail; 2028 goto fail;
@@ -2063,7 +2060,6 @@ static void drbd_connector_callback(struct cn_msg *req)
2063 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + rr; 2060 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + rr;
2064 cn_reply->flags = 0; 2061 cn_reply->flags = 0;
2065 2062
2066 trace_drbd_netlink(cn_reply, 0);
2067 rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL); 2063 rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL);
2068 if (rr && rr != -ESRCH) 2064 if (rr && rr != -ESRCH)
2069 printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr); 2065 printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);
@@ -2157,7 +2153,6 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
2157 reply->minor = mdev_to_minor(mdev); 2153 reply->minor = mdev_to_minor(mdev);
2158 reply->ret_code = NO_ERROR; 2154 reply->ret_code = NO_ERROR;
2159 2155
2160 trace_drbd_netlink(cn_reply, 0);
2161 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); 2156 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
2162} 2157}
2163 2158
@@ -2190,7 +2185,6 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
2190 reply->minor = mdev_to_minor(mdev); 2185 reply->minor = mdev_to_minor(mdev);
2191 reply->ret_code = NO_ERROR; 2186 reply->ret_code = NO_ERROR;
2192 2187
2193 trace_drbd_netlink(cn_reply, 0);
2194 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); 2188 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
2195} 2189}
2196 2190
@@ -2262,7 +2256,6 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
2262 reply->minor = mdev_to_minor(mdev); 2256 reply->minor = mdev_to_minor(mdev);
2263 reply->ret_code = NO_ERROR; 2257 reply->ret_code = NO_ERROR;
2264 2258
2265 trace_drbd_netlink(cn_reply, 0);
2266 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); 2259 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
2267 kfree(cn_reply); 2260 kfree(cn_reply);
2268} 2261}
@@ -2302,7 +2295,6 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
2302 reply->minor = mdev_to_minor(mdev); 2295 reply->minor = mdev_to_minor(mdev);
2303 reply->ret_code = NO_ERROR; 2296 reply->ret_code = NO_ERROR;
2304 2297
2305 trace_drbd_netlink(cn_reply, 0);
2306 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); 2298 cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
2307} 2299}
2308 2300
@@ -2356,7 +2348,6 @@ void drbd_nl_send_reply(struct cn_msg *req, int ret_code)
2356 reply->minor = ((struct drbd_nl_cfg_req *)req->data)->drbd_minor; 2348 reply->minor = ((struct drbd_nl_cfg_req *)req->data)->drbd_minor;
2357 reply->ret_code = ret_code; 2349 reply->ret_code = ret_code;
2358 2350
2359 trace_drbd_netlink(cn_reply, 0);
2360 rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); 2351 rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
2361 if (rr && rr != -ESRCH) 2352 if (rr && rr != -ESRCH)
2362 printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr); 2353 printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);