Skip to contentSkip to conversation

decnet: dn_dev: Remove an unnecessary label.

PATCH Applied Suraj Upadhyay 2 participants 2 messages Jul 14, 2020 – Jul 16, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 decnet: dn_dev: Remove an unnecessary label.

Remove the unnecessary label from dn_dev_ioctl() and make its error handling simpler to read.

---
Changes:
v2: Fixed indentation of break statement.
On Julia's Advise.

 net/decnet/dn_dev.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
net/decnet/dn_dev.c +3 -5
index 65abcf1b3210..15d42353f1a3 100644
@@ -462,7 +462,9 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
 	switch (cmd) {
 	case SIOCGIFADDR:
 		*((__le16 *)sdn->sdn_nodeaddr) = ifa->ifa_local;
-		goto rarok;
+		if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
+			ret = -EFAULT;
+		break;
 
 	case SIOCSIFADDR:
 		if (!ifa) {
@@ -485,10 +487,6 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
 	rtnl_unlock();
 
 	return ret;
-rarok:
-	if (copy_to_user(arg, ifr, DN_IFREQ_SIZE))
-		ret = -EFAULT;
-	goto done;
 }
 
 struct net_device *dn_dev_get_default(void)
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw
Quoted 4 lines · On Tue, 14 Jul 2020 19:53:28 +0530 Suraj Upadhyay wrote:

Remove the unnecessary label from dn_dev_ioctl() and make its error handling simpler to read.

Applied, thank you.