diff --git a/[refs] b/[refs] index c7b19dcd778f..f144cc8625a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b966b5dd8e17e6c105ca55533fd412de5d5b429e +refs/heads/master: 934e6138b56203231d757d7b5ca3252edffc210e diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c index f5732cf46c2f..8d2c3397cea8 100644 --- a/trunk/drivers/block/drbd/drbd_nl.c +++ b/trunk/drivers/block/drbd/drbd_nl.c @@ -2240,7 +2240,6 @@ int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info) enum drbd_ret_code retcode; cpumask_var_t new_cpu_mask; struct drbd_tconn *tconn; - int *rs_plan_s = NULL; struct res_opts res_opts; int err; @@ -2291,7 +2290,6 @@ int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info) } fail: - kfree(rs_plan_s); free_cpumask_var(new_cpu_mask); drbd_adm_finish(info, retcode);