From 9a3b0a291d2353aeb4f0e022a97b5bdcefe63fc4 Mon Sep 17 00:00:00 2001
From: Cheng Renquan <crquan@gmail.com>
Date: Thu, 20 Nov 2008 08:37:37 +0100
Subject: [PATCH] --- yaml --- r: 119669 b: refs/heads/master c:
 bf91db18ac2852a3ff39fe25ff56c5557c0fff78 h: refs/heads/master i:   119667:
 61d7e1609bb2022473dbb84277319e0d287ccea6 v: v3

---
 [refs]              | 2 +-
 trunk/block/genhd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97945fe7b7e1..fe7d932bec40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53cc0b2948bcb8a084982e6c1f9bd7b337e0df38
+refs/heads/master: bf91db18ac2852a3ff39fe25ff56c5557c0fff78
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index 27549e470da5..2f7feda61e35 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -1102,6 +1102,7 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
 			kfree(disk);
 			return NULL;
 		}
+		disk->node_id = node_id;
 		if (disk_expand_part_tbl(disk, 0)) {
 			free_part_stats(&disk->part0);
 			kfree(disk);
@@ -1116,7 +1117,6 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
 		device_initialize(disk_to_dev(disk));
 		INIT_WORK(&disk->async_notify,
 			media_change_notify_thread);
-		disk->node_id = node_id;
 	}
 	return disk;
 }