[PATCH] lib/kobject: restore old name on rename failure

From: Dong Hao
Date: Mon Jul 16 2012 - 09:37:23 EST


From: Dong Hao <haodong@xxxxxxxxxxxxxxxxxx>

The patch restores the old name while we fail to set the new
name for the kobject.

Signed-off-by: Dong Hao <haodong@xxxxxxxxxxxxxxxxxx>
---
lib/kobject.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index ef3d807..9d396c5 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -222,8 +222,10 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
return 0;

kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);
- if (!kobj->name)
+ if (!kobj->name){
+ kobj->name = old_name;
return -ENOMEM;
+ }

/* ewww... some of these buggers have '/' in the name ... */
while ((s = strchr(kobj->name, '/')))
--
1.7.2.5

--
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/