From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-wpan@vger.kernel.org, netdev@vger.kernel.org,
Alexander Aring <alex.aring@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Stefan Schmidt <stefan@osg.samsung.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] nl802154: Improve unlocking of a table in four functions
Date: Wed, 8 Nov 2017 17:15:59 +0100 [thread overview]
Message-ID: <f2f31af4-d8a6-a961-aa2a-f7b29203a3f4@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Nov 2017 17:08:55 +0100
* Add jump targets so that a call of the function "rdev_unlock_llsec_table"
is stored only once in these function implementations.
* Replace four calls by goto statements.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
net/ieee802154/nl802154.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index 99f6c254ea77..33865d355433 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1527,16 +1527,16 @@ nl802154_dump_llsec_key(struct sk_buff *skb, struct netlink_callback *cb)
rdev, wpan_dev->netdev, key) < 0) {
/* TODO */
err = -EIO;
- rdev_unlock_llsec_table(rdev, wpan_dev);
- goto out_err;
+ goto unlock_table;
}
}
cb->args[2] = 1;
out:
- rdev_unlock_llsec_table(rdev, wpan_dev);
err = skb->len;
+unlock_table:
+ rdev_unlock_llsec_table(rdev, wpan_dev);
out_err:
nl802154_finish_wpan_dev_dump(rdev);
@@ -1697,16 +1697,16 @@ nl802154_dump_llsec_dev(struct sk_buff *skb, struct netlink_callback *cb)
rdev, wpan_dev->netdev, dev) < 0) {
/* TODO */
err = -EIO;
- rdev_unlock_llsec_table(rdev, wpan_dev);
- goto out_err;
+ goto unlock_table;
}
}
cb->args[2] = 1;
out:
- rdev_unlock_llsec_table(rdev, wpan_dev);
err = skb->len;
+unlock_table:
+ rdev_unlock_llsec_table(rdev, wpan_dev);
out_err:
nl802154_finish_wpan_dev_dump(rdev);
@@ -1875,8 +1875,7 @@ nl802154_dump_llsec_devkey(struct sk_buff *skb, struct netlink_callback *cb)
kpos) < 0) {
/* TODO */
err = -EIO;
- rdev_unlock_llsec_table(rdev, wpan_dev);
- goto out_err;
+ goto unlock_table;
}
}
}
@@ -1884,8 +1883,9 @@ nl802154_dump_llsec_devkey(struct sk_buff *skb, struct netlink_callback *cb)
cb->args[2] = 1;
out:
- rdev_unlock_llsec_table(rdev, wpan_dev);
err = skb->len;
+unlock_table:
+ rdev_unlock_llsec_table(rdev, wpan_dev);
out_err:
nl802154_finish_wpan_dev_dump(rdev);
@@ -2034,16 +2034,16 @@ nl802154_dump_llsec_seclevel(struct sk_buff *skb, struct netlink_callback *cb)
rdev, wpan_dev->netdev, sl) < 0) {
/* TODO */
err = -EIO;
- rdev_unlock_llsec_table(rdev, wpan_dev);
- goto out_err;
+ goto unlock_table;
}
}
cb->args[2] = 1;
out:
- rdev_unlock_llsec_table(rdev, wpan_dev);
err = skb->len;
+unlock_table:
+ rdev_unlock_llsec_table(rdev, wpan_dev);
out_err:
nl802154_finish_wpan_dev_dump(rdev);
--
2.15.0
reply other threads:[~2017-11-08 16:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f2f31af4-d8a6-a961-aa2a-f7b29203a3f4@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stefan@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).