---

yaml --- r: 346039 b: refs/heads/master c: 934e613 h: refs/heads/master i: 346037: e6974ef 346035: 9691373 346031: 24c8cc9 v: v3
git-mirror · Nov 8, 2012 · 3e1e7ea · 3e1e7ea
1 parent bbea9b1
commit 3e1e7ea
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);