From 7224036fd733c6b1d2d01295e7d15635cbe168c8 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 17 Oct 2006 00:10:23 -0700
Subject: [PATCH] --- yaml --- r: 39743 b: refs/heads/master c:
 eee44cca665aa1a5663e6a00c2bdfc275739dac5 h: refs/heads/master i:   39741:
 ac93263768cb872d66de1f06bb9da3706a026b31   39739:
 1507dbbb39b2746d20e0679abfa3556cd70803ce   39735:
 4955a0d6a36d6f7e640ae86859ad2c9ed65fedb2   39727:
 c3ff6dd9d2cf6024bcd88095531c79cd45fbe749   39711:
 ae1990ace104c7dad7adcadd5afc958f89c1694f   39679:
 1d66859e295949d3ac20ddca83749b6780e651cc v: v3

---
 [refs]                      |  2 +-
 trunk/fs/partitions/check.c | 50 +++++++++++++++++++++++++++++++------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 75ca0cd8bf6b..6d2ca171a2a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b5f29675c6a1041aefc147271508bd56cf2b761
+refs/heads/master: eee44cca665aa1a5663e6a00c2bdfc275739dac5
diff --git a/trunk/fs/partitions/check.c b/trunk/fs/partitions/check.c
index 51c6a748df49..6fb4b6150d77 100644
--- a/trunk/fs/partitions/check.c
+++ b/trunk/fs/partitions/check.c
@@ -376,18 +376,48 @@ static char *make_block_name(struct gendisk *disk)
 	return name;
 }
 
-static void disk_sysfs_symlinks(struct gendisk *disk)
+static int disk_sysfs_symlinks(struct gendisk *disk)
 {
 	struct device *target = get_device(disk->driverfs_dev);
+	int err;
+	char *disk_name = NULL;
+
 	if (target) {
-		char *disk_name = make_block_name(disk);
-		sysfs_create_link(&disk->kobj,&target->kobj,"device");
-		if (disk_name) {
-			sysfs_create_link(&target->kobj,&disk->kobj,disk_name);
-			kfree(disk_name);
+		disk_name = make_block_name(disk);
+		if (!disk_name) {
+			err = -ENOMEM;
+			goto err_out;
 		}
+
+		err = sysfs_create_link(&disk->kobj, &target->kobj, "device");
+		if (err)
+			goto err_out_disk_name;
+
+		err = sysfs_create_link(&target->kobj, &disk->kobj, disk_name);
+		if (err)
+			goto err_out_dev_link;
 	}
-	sysfs_create_link(&disk->kobj, &block_subsys.kset.kobj, "subsystem");
+
+	err = sysfs_create_link(&disk->kobj, &block_subsys.kset.kobj,
+				"subsystem");
+	if (err)
+		goto err_out_disk_name_lnk;
+
+	kfree(disk_name);
+
+	return 0;
+
+err_out_disk_name_lnk:
+	if (target) {
+		sysfs_remove_link(&target->kobj, disk_name);
+err_out_dev_link:
+		sysfs_remove_link(&disk->kobj, "device");
+err_out_disk_name:
+		kfree(disk_name);
+err_out:
+		put_device(target);
+	}
+	return err;
 }
 
 /* Not exported, helper to add_disk(). */
@@ -406,7 +436,11 @@ void register_disk(struct gendisk *disk)
 		*s = '!';
 	if ((err = kobject_add(&disk->kobj)))
 		return;
-	disk_sysfs_symlinks(disk);
+	err = disk_sysfs_symlinks(disk);
+	if (err) {
+		kobject_del(&disk->kobj);
+		return;
+	}
  	disk_sysfs_add_subdirs(disk);
 
 	/* No minors to use for partitions */