From 40555824822c46417919ddcc8881a04a1f5103df Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@linbit.com>
Date: Tue, 21 Jun 2011 12:58:22 +0200
Subject: [PATCH] --- yaml --- r: 346089 b: refs/heads/master c:
 d0fa7fd680a56a3fd52817fe93c1c8abe7164ef1 h: refs/heads/master i:   346087:
 a0c9722188709e25457534882954368e5f7d9b8e v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/block/drbd/drbd_nl.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a20d153a45ba..d6f9508444c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afbbfa88bc506bc13b957c3811bce299de1d31d5
+refs/heads/master: d0fa7fd680a56a3fd52817fe93c1c8abe7164ef1
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index 930af5dbfa76..f92346296ae3 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -273,9 +273,6 @@ static int drbd_adm_prepare(struct sk_buff *skb, struct genl_info *info,
 
 static int drbd_adm_finish(struct genl_info *info, int retcode)
 {
-	struct nlattr *nla;
-	const char *resource_name = NULL;
-
 	if (adm_ctx.tconn) {
 		kref_put(&adm_ctx.tconn->kref, &conn_destroy);
 		adm_ctx.tconn = NULL;
@@ -285,15 +282,6 @@ static int drbd_adm_finish(struct genl_info *info, int retcode)
 		return -ENOMEM;
 
 	adm_ctx.reply_dh->ret_code = retcode;
-
-	nla = info->attrs[DRBD_NLA_CFG_CONTEXT];
-	if (nla) {
-		int maxtype = ARRAY_SIZE(drbd_cfg_context_nl_policy) - 1;
-		nla = drbd_nla_find_nested(maxtype, nla, __nla_type(T_ctx_resource_name));
-		if (nla && !IS_ERR(nla))
-			resource_name = nla_data(nla);
-	}
-
 	drbd_adm_send_reply(adm_ctx.reply_skb, info);
 	return 0;
 }