Attachment 674634 Details for Bug 862862 – [1/2] instrument dev_change_name()

[patch] [1/2] instrument dev_change_name()

1-instrument-dev_change_name-.patch (text/plain), 1.39 KB, created by Laszlo Ersek on 2013-01-08 09:18:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

Created: 2013-01-08 09:18:42 UTC

Size: 1.39 KB

patch

obsolete

>d2ba97cbb6101eca32ca5ae792bc1b01655a0e72
>diff --git a/net/core/dev.c b/net/core/dev.c
>index 1d3e58e..16fff8c 100644
>--- a/net/core/dev.c
>+++ b/net/core/dev.c
>@@ -784,22 +784,36 @@ int dev_change_name(struct net_device *dev, char *newname)
> {
> 	int err = 0;
> 
>+	printk(KERN_DEBUG "%s: '%s' -> '%s' enter\n", __FUNCTION__, dev->name,
>+	       newname);
>+
> 	ASSERT_RTNL();
> 
>-	if (dev->flags & IFF_UP)
>+	if (dev->flags & IFF_UP) {
>+		printk(KERN_DEBUG "%s: exit (EBUSY)\n", __FUNCTION__);
> 		return -EBUSY;
>+	}
> 
>-	if (!dev_valid_name(newname))
>+	if (!dev_valid_name(newname)) {
>+		printk(KERN_DEBUG "%s: exit (EINVAL)\n", __FUNCTION__);
> 		return -EINVAL;
>+	}
> 
> 	if (strchr(newname, '%')) {
> 		err = dev_alloc_name(dev, newname);
>-		if (err < 0)
>+		if (err < 0) {
>+			printk(KERN_DEBUG "%s: exit (dev_alloc_name=%d)\n",
>+			       __FUNCTION__, err);
> 			return err;
>+		}
> 		strcpy(newname, dev->name);
>+		printk(KERN_DEBUG "%s: dev_alloc_name(): '%s'\n", __FUNCTION__,
>+		       newname);
> 	}
>-	else if (__dev_get_by_name(newname))
>+	else if (__dev_get_by_name(newname)) {
>+		printk(KERN_DEBUG "%s: exit (EEXIST)\n", __FUNCTION__);
> 		return -EEXIST;
>+	}
> 	else
> 		strlcpy(dev->name, newname, IFNAMSIZ);
> 
>@@ -811,6 +825,8 @@ int dev_change_name(struct net_device *dev, char *newname)
> 				NETDEV_CHANGENAME, dev);
> 	}
> 
>+	printk(KERN_DEBUG "%s: exit (class_device_rename=%d)\n", __FUNCTION__,
>+	       err);
> 	return err;
> }
>

Actions: View | Diff

Attachments on bug 862862: 624960 | 629093 | 653948 | 653952 | 663166 | 663204 | 663206 | 672173 | 672220 | 674634 | 674635 | 674871 | 674973 | 675360 | 675802