[PATCH]sysfs: Don't emit a warning when sysfs_rename_link() fails.

[Cornelia Huck]

Hi Greg, hi Eric,

the recent sysfs tagged directory changes switched device_rename() to
sysfs_rename_link() - which is a good thing but AFAICS re-introduces
the scary warnings when a netdevice is renamed to something that
already exists (which I tried to fix with
36ce6dad6e3cb3f050ed41e0beac0070d2062b25).

The following patch switches sysfs_rename_link() to non-warning symlink
creation again. It is on top of the current driver core series.

sysfs: Don't emit a warning when sysfs_rename_link() fails.

From: Cornelia Huck <cornelia.huck@xxxxxxxxxx>

sysfs_rename_link() will be printing a scary looking warning
if a link of the same name already exists. Callers of
device_rename() don't want to see this warning since they
already handle the failure themselves, so let's use the not
warning variant of sysfs_do_create_link().

Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>

---
 fs/sysfs/symlink.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6/fs/sysfs/symlink.c
===================================================================
--- linux-2.6.orig/fs/sysfs/symlink.c
+++ linux-2.6/fs/sysfs/symlink.c
@@ -135,7 +135,7 @@ int sysfs_rename_link(struct kobject *ko
 			const char *old, const char *new)
 {
 	sysfs_delete_link(kobj, targ, old);
-	return sysfs_create_link(kobj, targ, new);
+	return sysfs_do_create_link(kobj, targ, new, 0);
 }
 
 static int sysfs_get_target_path(struct sysfs_dirent *parent_sd,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/